From 7322343b9322b93d97077575f95a00dcca3f0451 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Thu, 28 Apr 2016 10:51:13 -0700 Subject: More FWL interface cleanup. This CL merges the IFWL_Target class into IFWL_Widget and IFWL_Thread into IFWL_App. The IFWL_WidgetMgrDelegate, IFWL_NoteDriver and IFWL_NotThread are removed in favour of their concrete classes. Review-Url: https://codereview.chromium.org/1921853006 --- xfa/fwl/core/fwl_appimp.h | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 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 a7130602fd..8743b54a43 100644 --- a/xfa/fwl/core/fwl_appimp.h +++ b/xfa/fwl/core/fwl_appimp.h @@ -9,18 +9,23 @@ #include -#include "xfa/fwl/core/fwl_threadimp.h" +#include "xfa/fwl/core/fwl_noteimp.h" class CFWL_WidgetMgr; class IFWL_AdapterNative; -class IFWL_WidgetMgr; -class IFWL_ThemeProvider; class IFWL_App; +class IFWL_NoteThread; +class IFWL_ThemeProvider; +class IFWL_WidgetMgr; -class CFWL_AppImp : public CFWL_ThreadImp { +class CFWL_AppImp { public: CFWL_AppImp(IFWL_App* pIface, IFWL_AdapterNative* pAdapter); virtual ~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; @@ -33,6 +38,10 @@ class CFWL_AppImp : public CFWL_ThreadImp { IFWL_AdapterNative* const m_pAdapterNative; std::unique_ptr m_pWidgetMgr; IFWL_ThemeProvider* m_pThemeProvider; + std::unique_ptr m_pNoteDriver; + + private: + IFWL_App* const m_pIface; }; #endif // XFA_FWL_CORE_FWL_APPIMP_H_ -- cgit v1.2.3