From 20855384b8149a631c3c1d229551523c12eb767b Mon Sep 17 00:00:00 2001 From: dsinclair Date: Mon, 31 Oct 2016 07:29:34 -0700 Subject: Remove FWL globals. This CL removes the FWL_GetApp, FWL_SetApp and FWL_GetWidgetAdapter methods. In the process it changes the various Initialize methods to return void. Review-Url: https://codereview.chromium.org/2436103002 --- xfa/fwl/core/cfwl_widget.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'xfa/fwl/core/cfwl_widget.h') diff --git a/xfa/fwl/core/cfwl_widget.h b/xfa/fwl/core/cfwl_widget.h index cc6967852f..b96c1ffaec 100644 --- a/xfa/fwl/core/cfwl_widget.h +++ b/xfa/fwl/core/cfwl_widget.h @@ -21,7 +21,7 @@ class CFWL_WidgetMgr; class CFWL_Widget { public: - CFWL_Widget(); + CFWL_Widget(const IFWL_App*); virtual ~CFWL_Widget(); virtual IFWL_Widget* GetWidget(); @@ -54,8 +54,9 @@ class CFWL_Widget { IFWL_WidgetDelegate* SetDelegate(IFWL_WidgetDelegate* pDelegate); protected: - FWL_Error Initialize(const CFWL_WidgetProperties* pProperties = nullptr); + void Initialize(const CFWL_WidgetProperties* pProperties); + const IFWL_App* m_pApp; std::unique_ptr m_pIface; IFWL_WidgetDelegate* m_pDelegate; CFWL_WidgetMgr* const m_pWidgetMgr; -- cgit v1.2.3