Remove FWL globals.

xfa/fwl/core/ifwl_combolist.cpp

Index: xfa/fwl/core/ifwl_combolist.cpp
diff --git a/xfa/fwl/core/ifwl_combolist.cpp b/xfa/fwl/core/ifwl_combolist.cpp
index d34a55bcc21901486d01bfde3da84ac783ffaa78..6538bff20da35aec498913ef61f1778a3ec1a6a9 100644
--- a/xfa/fwl/core/ifwl_combolist.cpp
+++ b/xfa/fwl/core/ifwl_combolist.cpp
@@ -9,18 +9,19 @@
 #include "xfa/fwl/core/ifwl_combobox.h"
 #include "xfa/fwl/core/ifwl_comboedit.h"
 
-IFWL_ComboList::IFWL_ComboList(const CFWL_WidgetImpProperties& properties,
+IFWL_ComboList::IFWL_ComboList(const IFWL_App* app,
+                               const CFWL_WidgetImpProperties& properties,
                                IFWL_Widget* pOuter)
-    : IFWL_ListBox(properties, pOuter), m_bNotifyOwner(TRUE) {
+    : IFWL_ListBox(app, properties, pOuter), m_bNotifyOwner(TRUE) {
   ASSERT(pOuter);
 }
 
-FWL_Error IFWL_ComboList::Initialize() {
-  if (IFWL_ListBox::Initialize() != FWL_Error::Succeeded)
-    return FWL_Error::Indefinite;
+void IFWL_ComboList::Initialize() {
+  IFWL_ListBox::Initialize();
+
+  // Delete the delegate that was created by IFWL_ListBox::Initialize ...
   delete m_pDelegate;
   m_pDelegate = new CFWL_ComboListImpDelegate(this);

[Tom Sepez, 2016/10/28 23:11:47]

nit: maybe m_pDelegate should be unique_ptr.  Also it seems wrong for the
subclass to be manipulating the superclass instance variables rather than
calling a SetDelegate() method in the superclass.

[dsinclair, 2016/10/31 14:13:18]

Ack. I'm working on that, will be in a follow up CL. I think we need to pass it
down the constructors as it does some weird stuff currently.

-  return FWL_Error::Succeeded;
 }
 
 void IFWL_ComboList::Finalize() {