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

5 files changed, 8 insertions, 8 deletions

diff --git a/xfa/include/fwl/lightwidget/app.h b/xfa/include/fwl/lightwidget/app.h
index 11919508aa..b69be8368b 100644
--- a/xfa/include/fwl/lightwidget/app.h
+++ b/xfa/include/fwl/lightwidget/app.h
@@ -9,7 +9,7 @@
 class CFWL_Theme;

 class IFWL_App;

 class CFWL_App;

-class CFWL_App : public CFX_Object

+class CFWL_App

 {

 public:

     CFWL_App();

diff --git a/xfa/include/fwl/lightwidget/combobox.h b/xfa/include/fwl/lightwidget/combobox.h
index eac58569aa..46aec5bc8a 100644
--- a/xfa/include/fwl/lightwidget/combobox.h
+++ b/xfa/include/fwl/lightwidget/combobox.h
@@ -96,7 +96,7 @@ protected:
     };

     CFWL_ComboBoxDP m_comboBoxData;

 };

-class CFWL_ComboBoxItem : public CFX_Object

+class CFWL_ComboBoxItem

 {

 public:

     CFWL_ComboBoxItem()

diff --git a/xfa/include/fwl/lightwidget/listbox.h b/xfa/include/fwl/lightwidget/listbox.h
index 3cb1131e8b..55eddabb48 100644
--- a/xfa/include/fwl/lightwidget/listbox.h
+++ b/xfa/include/fwl/lightwidget/listbox.h
@@ -41,7 +41,7 @@ public:
     CFWL_ListBox();

     virtual ~CFWL_ListBox();

 protected:

-    class CFWL_ListBoxDP : public IFWL_ListBoxDP, public CFX_Object

+    class CFWL_ListBoxDP : public IFWL_ListBoxDP

     {

     public:

         CFWL_ListBoxDP();

@@ -74,7 +74,7 @@ protected:
     };

     CFWL_ListBoxDP m_ListBoxDP;

 };

-class CFWL_ListItem : public CFX_Object

+class CFWL_ListItem

 {

 public:

     CFWL_ListItem()

diff --git a/xfa/include/fwl/lightwidget/theme.h b/xfa/include/fwl/lightwidget/theme.h
index 95e4ed16e3..0edd9d4b3d 100644
--- a/xfa/include/fwl/lightwidget/theme.h
+++ b/xfa/include/fwl/lightwidget/theme.h
@@ -12,7 +12,7 @@ class CFWL_ThemePart;
 class CFWL_WidgetTP;

 class IFWL_Widget;

 class CFWL_Theme;

-class CFWL_Theme : public CFX_Object

+class CFWL_Theme

 {

 public:

     virtual FX_BOOL		IsValidWidget(IFWL_Widget *pWidget);

diff --git a/xfa/include/fwl/lightwidget/widget.h b/xfa/include/fwl/lightwidget/widget.h
index af5bddb5e7..222ce1c768 100644
--- a/xfa/include/fwl/lightwidget/widget.h
+++ b/xfa/include/fwl/lightwidget/widget.h
@@ -13,7 +13,7 @@ class IFWL_WidgetDelegate;
 class IFWL_Widget;

 class CFWL_Widget;

 class CFWL_WidgetDelegate;

-class CFWL_WidgetProperties : public CFX_Object

+class CFWL_WidgetProperties

 {

 public:

     CFWL_WidgetProperties()

@@ -35,7 +35,7 @@ public:
     CFWL_Widget			*m_pParent;

     CFWL_Widget			*m_pOwner;

 };

-class CFWL_Widget : public CFX_Object

+class CFWL_Widget

 {

 public:

     IFWL_Widget*	GetWidget();

@@ -89,7 +89,7 @@ public:
     CFWL_WidgetMgr		*m_pWidgetMgr;

     CFWL_WidgetProperties *m_pProperties;

 };

-class CFWL_WidgetDelegate : public CFX_Object, public IFWL_WidgetDelegate

+class CFWL_WidgetDelegate

 {

 public:

     CFWL_WidgetDelegate();