From a5811f0edbaa3be7807dd84b3d4d7876289cef8a Mon Sep 17 00:00:00 2001 From: dsinclair Date: Thu, 3 Nov 2016 12:27:25 -0700 Subject: Unify CFWL_WidgetProperties and CFWL_WidgetImpProperties. The CFWL_WidgetProperties class was just being used to create default CFWL_WidgetImpProperties classes. This CL updates the code to make it clear that we have unique_ptrs to the properties and changes CFWL_WidgetImpProperties to be named CFWL_WidgetProperties. Review-Url: https://codereview.chromium.org/2469893004 --- xfa/fwl/core/ifwl_caret.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'xfa/fwl/core/ifwl_caret.cpp') diff --git a/xfa/fwl/core/ifwl_caret.cpp b/xfa/fwl/core/ifwl_caret.cpp index 4e9b7f64b5..8971c2ee8c 100644 --- a/xfa/fwl/core/ifwl_caret.cpp +++ b/xfa/fwl/core/ifwl_caret.cpp @@ -8,15 +8,15 @@ #include "third_party/base/ptr_util.h" #include "xfa/fwl/core/cfwl_themebackground.h" -#include "xfa/fwl/core/cfwl_widgetimpproperties.h" +#include "xfa/fwl/core/cfwl_widgetproperties.h" #include "xfa/fwl/core/fwl_noteimp.h" #include "xfa/fwl/core/ifwl_caret.h" #include "xfa/fwl/core/ifwl_themeprovider.h" IFWL_Caret::IFWL_Caret(const IFWL_App* app, - const CFWL_WidgetImpProperties& properties, + std::unique_ptr properties, IFWL_Widget* pOuter) - : IFWL_Widget(app, properties, pOuter), + : IFWL_Widget(app, std::move(properties), pOuter), m_pTimer(new IFWL_Caret::Timer(this)), m_pTimerInfo(nullptr), m_dwElapse(400), -- cgit v1.2.3