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_scrollbar.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'xfa/fwl/core/ifwl_scrollbar.h') diff --git a/xfa/fwl/core/ifwl_scrollbar.h b/xfa/fwl/core/ifwl_scrollbar.h index 5c41fdd2a1..15b1b95f0e 100644 --- a/xfa/fwl/core/ifwl_scrollbar.h +++ b/xfa/fwl/core/ifwl_scrollbar.h @@ -8,13 +8,12 @@ #define XFA_FWL_CORE_IFWL_SCROLLBAR_H_ #include "core/fxcrt/fx_system.h" -#include "xfa/fwl/core/cfwl_widgetimpproperties.h" +#include "xfa/fwl/core/cfwl_widgetproperties.h" #include "xfa/fwl/core/fwl_error.h" #include "xfa/fwl/core/ifwl_dataprovider.h" #include "xfa/fwl/core/ifwl_timer.h" #include "xfa/fwl/core/ifwl_widget.h" -class CFWL_WidgetImpProperties; class IFWL_Widget; #define FWL_STYLEEXT_SCB_Horz (0L << 0) @@ -38,7 +37,7 @@ class IFWL_ScrollBarDP : public IFWL_DataProvider {}; class IFWL_ScrollBar : public IFWL_Widget { public: IFWL_ScrollBar(const IFWL_App* app, - const CFWL_WidgetImpProperties& properties, + std::unique_ptr properties, IFWL_Widget* pOuter); ~IFWL_ScrollBar() override; -- cgit v1.2.3