From 55fa356c8ce72c597e75fc591fc67597b1c019d5 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Wed, 4 May 2016 14:24:53 -0700 Subject: Cleanup IFWL_Adapter interfaces. This CL removes: * IFWL_AdapterNative * IFWL_Adapter{Widget|Thread}Mgr * IFWL_WidgetMgrDelegate * CFWL_SDAdapter{Widget|Thread}Mgr Methods which just returned have also been removed. Review-Url: https://codereview.chromium.org/1928963004 --- xfa/fwl/core/fwl_appimp.h | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) (limited to 'xfa/fwl/core/fwl_appimp.h') diff --git a/xfa/fwl/core/fwl_appimp.h b/xfa/fwl/core/fwl_appimp.h index 8743b54a43..64b7922a15 100644 --- a/xfa/fwl/core/fwl_appimp.h +++ b/xfa/fwl/core/fwl_appimp.h @@ -12,7 +12,7 @@ #include "xfa/fwl/core/fwl_noteimp.h" class CFWL_WidgetMgr; -class IFWL_AdapterNative; +class CXFA_FFApp; class IFWL_App; class IFWL_NoteThread; class IFWL_ThemeProvider; @@ -20,27 +20,25 @@ class IFWL_WidgetMgr; class CFWL_AppImp { public: - CFWL_AppImp(IFWL_App* pIface, IFWL_AdapterNative* pAdapter); - virtual ~CFWL_AppImp(); + CFWL_AppImp(IFWL_App* pIface, CXFA_FFApp* pAdapter); + ~CFWL_AppImp(); IFWL_App* GetInterface() const { return m_pIface; } CFWL_NoteDriver* GetNoteDriver() const { return m_pNoteDriver.get(); } - virtual FWL_ERR Initialize(); - virtual FWL_ERR Finalize(); - virtual IFWL_AdapterNative* GetAdapterNative() const; - virtual IFWL_WidgetMgr* GetWidgetMgr() const; - virtual IFWL_ThemeProvider* GetThemeProvider() const; - virtual FWL_ERR SetThemeProvider(IFWL_ThemeProvider* pThemeProvider); - virtual FWL_ERR Exit(int32_t iExitCode = 0); + FWL_ERR Initialize(); + FWL_ERR Finalize(); + CXFA_FFApp* GetAdapterNative() const; + IFWL_WidgetMgr* GetWidgetMgr() const; + IFWL_ThemeProvider* GetThemeProvider() const; + void SetThemeProvider(IFWL_ThemeProvider* pThemeProvider); + void Exit(int32_t iExitCode); - protected: - IFWL_AdapterNative* const m_pAdapterNative; + private: + CXFA_FFApp* const m_pAdapterNative; std::unique_ptr m_pWidgetMgr; IFWL_ThemeProvider* m_pThemeProvider; std::unique_ptr m_pNoteDriver; - - private: IFWL_App* const m_pIface; }; -- cgit v1.2.3