Move xfa/fwl/core to xfa/fwl.

xfa/fwl/cfwl_widget.h

Index: xfa/fwl/cfwl_widget.h
diff --git a/xfa/fwl/core/cfwl_widget.h b/xfa/fwl/cfwl_widget.h
similarity index 94%
rename from xfa/fwl/core/cfwl_widget.h
rename to xfa/fwl/cfwl_widget.h
index 15acbf53c0dd78dc0c4906f654bf053928aa655c..53839a761b2c7c2bf9685034d65f3b2722af27e0 100644
--- a/xfa/fwl/core/cfwl_widget.h
+++ b/xfa/fwl/cfwl_widget.h
@@ -4,17 +4,17 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_CFWL_WIDGET_H_
-#define XFA_FWL_CORE_CFWL_WIDGET_H_
+#ifndef XFA_FWL_CFWL_WIDGET_H_
+#define XFA_FWL_CFWL_WIDGET_H_
 #include <memory>
 
 #include "core/fxcrt/fx_coordinates.h"
 #include "core/fxcrt/fx_system.h"
-#include "xfa/fwl/core/cfwl_event.h"
-#include "xfa/fwl/core/cfwl_themepart.h"
-#include "xfa/fwl/core/cfwl_widgetmgr.h"
-#include "xfa/fwl/core/fwl_widgethit.h"
-#include "xfa/fwl/core/ifwl_widgetdelegate.h"
+#include "xfa/fwl/cfwl_event.h"
+#include "xfa/fwl/cfwl_themepart.h"
+#include "xfa/fwl/cfwl_widgetmgr.h"
+#include "xfa/fwl/fwl_widgethit.h"
+#include "xfa/fwl/ifwl_widgetdelegate.h"
 #include "xfa/fwl/theme/cfwl_widgettp.h"
 
 enum class FWL_Type {
@@ -39,7 +39,7 @@ enum class FWL_Type {
 
 class CFWL_App;
 class CFWL_AppImp;
-class CFWL_MsgKey;
+class CFWL_MessageKey;
 class CFWL_Widget;
 class CFWL_WidgetMgr;
 class CFWL_WidgetProperties;
@@ -193,4 +193,4 @@ class CFWL_Widget : public IFWL_WidgetDelegate {
   IFWL_WidgetDelegate* m_pDelegate;  // Not owned.
 };
 
-#endif  // XFA_FWL_CORE_CFWL_WIDGET_H_
+#endif  // XFA_FWL_CFWL_WIDGET_H_