From c777f486f84611d2fdd2d03af661b14955f9efb6 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Wed, 4 May 2016 17:57:03 -0700 Subject: Convert FWL_ERR into an enum class. This Cl updates FWL_ERR to be an FWL_Error enum class. It removes FX_ERR and replaces it with FWL_Error as well as the values were the same. There were many places where we either returned other values for FWL_ERR results. This Cl is the same as: https://codereview.chromium.org/1943413002/ but I seem to have messed up the base URL in that one. TBR=tsepez@chromium.org Review-Url: https://codereview.chromium.org/1952693003 --- xfa/fwl/core/fwl_appimp.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'xfa/fwl/core/fwl_appimp.cpp') diff --git a/xfa/fwl/core/fwl_appimp.cpp b/xfa/fwl/core/fwl_appimp.cpp index ac00cca144..d7fa8bc1c0 100644 --- a/xfa/fwl/core/fwl_appimp.cpp +++ b/xfa/fwl/core/fwl_appimp.cpp @@ -20,11 +20,11 @@ IFWL_App* IFWL_App::Create(CXFA_FFApp* pAdapter) { void IFWL_App::Release() {} -FWL_ERR IFWL_App::Initialize() { +FWL_Error IFWL_App::Initialize() { return static_cast(GetImpl())->Initialize(); } -FWL_ERR IFWL_App::Finalize() { +FWL_Error IFWL_App::Finalize() { return static_cast(GetImpl())->Finalize(); } @@ -62,15 +62,15 @@ CFWL_AppImp::~CFWL_AppImp() { CFWL_ToolTipContainer::DeleteInstance(); } -FWL_ERR CFWL_AppImp::Initialize() { +FWL_Error CFWL_AppImp::Initialize() { if (!m_pWidgetMgr) { m_pWidgetMgr.reset(new CFWL_WidgetMgr(m_pAdapterNative)); } - return FWL_ERR_Succeeded; + return FWL_Error::Succeeded; } -FWL_ERR CFWL_AppImp::Finalize() { +FWL_Error CFWL_AppImp::Finalize() { m_pWidgetMgr.reset(); - return FWL_ERR_Succeeded; + return FWL_Error::Succeeded; } CXFA_FFApp* CFWL_AppImp::GetAdapterNative() const { return m_pAdapterNative; @@ -82,6 +82,7 @@ CXFA_FWLAdapterWidgetMgr* FWL_GetAdapterWidgetMgr() { IFWL_WidgetMgr* CFWL_AppImp::GetWidgetMgr() const { return m_pWidgetMgr.get(); } + void CFWL_AppImp::SetThemeProvider(IFWL_ThemeProvider* pThemeProvider) { m_pThemeProvider = pThemeProvider; } -- cgit v1.2.3