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

1 files changed, 18 insertions, 21 deletions

diff --git a/xfa/fwl/core/cfwl_checkbox.cpp b/xfa/fwl/core/cfwl_checkbox.cpp
index bc55a690f3..8ae3e970e3 100644
--- a/xfa/fwl/core/cfwl_checkbox.cpp
+++ b/xfa/fwl/core/cfwl_checkbox.cpp
@@ -10,6 +10,24 @@
 
 #include "xfa/fwl/core/fwl_error.h"
 
+CFWL_CheckBox::CFWL_CheckBox(const IFWL_App* app) : CFWL_Widget(app) {}
+
+CFWL_CheckBox::~CFWL_CheckBox() {}
+
+void CFWL_CheckBox::Initialize(const CFWL_WidgetProperties* pProperties) {
+  ASSERT(!m_pIface);
+
+  if (pProperties)
+    *m_pProperties = *pProperties;
+
+  std::unique_ptr<IFWL_CheckBox> pCheckBox(new IFWL_CheckBox(
+      m_pApp, m_pProperties->MakeWidgetImpProperties(&m_checkboxData)));
+  pCheckBox->Initialize();
+
+  m_pIface = std::move(pCheckBox);
+  CFWL_Widget::Initialize(pProperties);
+}
+
 IFWL_CheckBox* CFWL_CheckBox::GetWidget() {
   return static_cast<IFWL_CheckBox*>(m_pIface.get());
 }
@@ -18,23 +36,6 @@ const IFWL_CheckBox* CFWL_CheckBox::GetWidget() const {
   return static_cast<IFWL_CheckBox*>(m_pIface.get());
 }
 
-FWL_Error CFWL_CheckBox::Initialize(const CFWL_WidgetProperties* pProperties) {
-  if (m_pIface)
-    return FWL_Error::Indefinite;
-  if (pProperties) {
-    *m_pProperties = *pProperties;
-  }
-  std::unique_ptr<IFWL_CheckBox> pCheckBox(new IFWL_CheckBox(
-      m_pProperties->MakeWidgetImpProperties(&m_checkboxData)));
-  FWL_Error ret = pCheckBox->Initialize();
-  if (ret != FWL_Error::Succeeded) {
-    return ret;
-  }
-  m_pIface = std::move(pCheckBox);
-  CFWL_Widget::Initialize();
-  return FWL_Error::Succeeded;
-}
-
 FWL_Error CFWL_CheckBox::SetCaption(const CFX_WideStringC& wsCaption) {
   m_checkboxData.m_wsCaption = wsCaption;
   return FWL_Error::Succeeded;
@@ -53,10 +54,6 @@ FWL_Error CFWL_CheckBox::SetCheckState(int32_t iCheck) {
   return GetWidget()->SetCheckState(iCheck);
 }
 
-CFWL_CheckBox::CFWL_CheckBox() {}
-
-CFWL_CheckBox::~CFWL_CheckBox() {}
-
 CFWL_CheckBox::CFWL_CheckBoxDP::CFWL_CheckBoxDP()
     : m_fBoxHeight(16.0f), m_wsCaption(L"Check box") {}