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_checkbox.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'xfa/fwl/core/ifwl_checkbox.h') diff --git a/xfa/fwl/core/ifwl_checkbox.h b/xfa/fwl/core/ifwl_checkbox.h index c08d845d29..19ab626175 100644 --- a/xfa/fwl/core/ifwl_checkbox.h +++ b/xfa/fwl/core/ifwl_checkbox.h @@ -8,7 +8,7 @@ #define XFA_FWL_CORE_IFWL_CHECKBOX_H_ #include "xfa/fwl/core/cfwl_event.h" -#include "xfa/fwl/core/cfwl_widgetimpproperties.h" +#include "xfa/fwl/core/cfwl_widgetproperties.h" #include "xfa/fwl/core/ifwl_dataprovider.h" #include "xfa/fwl/core/ifwl_widget.h" @@ -44,7 +44,7 @@ #define FWL_STATE_CKB_CheckMask (3L << (FWL_WGTSTATE_MAX + 2)) class CFWL_MsgMouse; -class CFWL_WidgetImpProperties; +class CFWL_WidgetProperties; class IFWL_Widget; FWL_EVENT_DEF(CFWL_EvtCkbCheckStateChanged, CFWL_EventType::CheckStateChanged) @@ -57,7 +57,7 @@ class IFWL_CheckBoxDP : public IFWL_DataProvider { class IFWL_CheckBox : public IFWL_Widget { public: explicit IFWL_CheckBox(const IFWL_App* app, - const CFWL_WidgetImpProperties& properties); + std::unique_ptr properties); ~IFWL_CheckBox() override; // IFWL_Widget -- cgit v1.2.3