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

1 files changed, 3 insertions, 3 deletions

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();