From 6fc8cbb4ffbc17732045d243e1b95bc04c8a3b33 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 14 Apr 2015 13:50:34 -0700 Subject: Merge to XFA: Kill CFX_Object. Not just a simple merge, but changes to remove CFX_Object from XFA. Original Review URL: https://codereview.chromium.org/1088733002 TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1087053002 --- xfa/include/fwl/core/fwl_theme.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'xfa/include/fwl/core/fwl_theme.h') diff --git a/xfa/include/fwl/core/fwl_theme.h b/xfa/include/fwl/core/fwl_theme.h index efef288afc..59d5ab0a2a 100644 --- a/xfa/include/fwl/core/fwl_theme.h +++ b/xfa/include/fwl/core/fwl_theme.h @@ -26,7 +26,7 @@ class IFWL_ThemeProvider; #define FWL_WGTCAPACITY_UIMargin 12 #define FWL_WGTCAPACITY_SpaceAboveBelow 13 #define FWL_WGTCAPACITY_MAX 65535 -class CFWL_ThemePart : public CFX_Object +class CFWL_ThemePart { public: CFWL_ThemePart() -- cgit v1.2.3