Move xfa/fwl/core to xfa/fwl.

xfa/fwl/cfwl_combolist.h

Index: xfa/fwl/cfwl_combolist.h
diff --git a/xfa/fwl/core/cfwl_combolist.h b/xfa/fwl/cfwl_combolist.h
similarity index 63%
rename from xfa/fwl/core/cfwl_combolist.h
rename to xfa/fwl/cfwl_combolist.h
index 0c1cd579b0a51c15a8448e4ff6af51548dec8df3..e1d5fd9b2483ed79e2efbfd1fd4c6feaaa29f7ca 100644
--- a/xfa/fwl/core/cfwl_combolist.h
+++ b/xfa/fwl/cfwl_combolist.h
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_CFWL_COMBOLIST_H_
-#define XFA_FWL_CORE_CFWL_COMBOLIST_H_
+#ifndef XFA_FWL_CFWL_COMBOLIST_H_
+#define XFA_FWL_CFWL_COMBOLIST_H_
 
 #include <memory>
 
-#include "xfa/fwl/core/cfwl_listbox.h"
-#include "xfa/fwl/core/cfwl_widget.h"
-#include "xfa/fwl/core/cfwl_widgetproperties.h"
+#include "xfa/fwl/cfwl_listbox.h"
+#include "xfa/fwl/cfwl_widget.h"
+#include "xfa/fwl/cfwl_widgetproperties.h"
 
 class CFWL_ComboList : public CFWL_ListBox {
  public:
@@ -31,13 +31,13 @@ class CFWL_ComboList : public CFWL_ListBox {
  private:
   void ClientToOuter(FX_FLOAT& fx, FX_FLOAT& fy);
   void OnDropListFocusChanged(CFWL_Message* pMsg, bool bSet);
-  void OnDropListMouseMove(CFWL_MsgMouse* pMsg);
-  void OnDropListLButtonDown(CFWL_MsgMouse* pMsg);
-  void OnDropListLButtonUp(CFWL_MsgMouse* pMsg);
-  bool OnDropListKey(CFWL_MsgKey* pKey);
-  void OnDropListKeyDown(CFWL_MsgKey* pKey);
+  void OnDropListMouseMove(CFWL_MessageMouse* pMsg);
+  void OnDropListLButtonDown(CFWL_MessageMouse* pMsg);
+  void OnDropListLButtonUp(CFWL_MessageMouse* pMsg);
+  bool OnDropListKey(CFWL_MessageKey* pKey);
+  void OnDropListKeyDown(CFWL_MessageKey* pKey);
 
   bool m_bNotifyOwner;
 };
 
-#endif  // XFA_FWL_CORE_CFWL_COMBOLIST_H_
+#endif  // XFA_FWL_CFWL_COMBOLIST_H_