summaryrefslogtreecommitdiff
path: root/xfa/include/fwl/adapter/fwl_sdadapterimp.h
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-04-14 13:50:34 -0700
committerTom Sepez <tsepez@chromium.org>2015-04-14 13:50:34 -0700
commit6fc8cbb4ffbc17732045d243e1b95bc04c8a3b33 (patch)
treee2fc5ec44d0e83e7f8d066b14d1628b8f5cebe87 /xfa/include/fwl/adapter/fwl_sdadapterimp.h
parent63de95b699a4374982c2ddffced89e0da028fe4c (diff)
downloadpdfium-6fc8cbb4ffbc17732045d243e1b95bc04c8a3b33.tar.xz
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
Diffstat (limited to 'xfa/include/fwl/adapter/fwl_sdadapterimp.h')
-rw-r--r--xfa/include/fwl/adapter/fwl_sdadapterimp.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/xfa/include/fwl/adapter/fwl_sdadapterimp.h b/xfa/include/fwl/adapter/fwl_sdadapterimp.h
index 98b2ecbaf0..6f8170ff5c 100644
--- a/xfa/include/fwl/adapter/fwl_sdadapterimp.h
+++ b/xfa/include/fwl/adapter/fwl_sdadapterimp.h
@@ -14,7 +14,7 @@ class IFWL_WidgetMgrDelegate;
class CFWL_SDAdatperNative;
class CFWL_SDAdapterWidgetMgr;
class CFWL_SDAdapterTimerMgr;
-class CFWL_SDAdapterWidgetMgr : public IFWL_AdapterWidgetMgr, public CFX_Object
+class CFWL_SDAdapterWidgetMgr : public IFWL_AdapterWidgetMgr
{
public:
CFWL_SDAdapterWidgetMgr();
@@ -56,7 +56,7 @@ public:
virtual FWL_ERR SetMessageHook(IFWL_AdapterMessageHook *hook);
virtual FWL_ERR GetSystemBorder(FX_FLOAT &l, FX_FLOAT &t, FX_FLOAT &r, FX_FLOAT &b);
};
-class CFWL_SDAdapterThreadMgr : public IFWL_AdapterThreadMgr, public CFX_Object
+class CFWL_SDAdapterThreadMgr : public IFWL_AdapterThreadMgr
{
public:
CFWL_SDAdapterThreadMgr();