Move xfa/fwl/core to xfa/fwl.

xfa/fwl/cfwl_spinbutton.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_CFWL_SPINBUTTON_H_
-#define XFA_FWL_CORE_CFWL_SPINBUTTON_H_
+#ifndef XFA_FWL_CFWL_SPINBUTTON_H_
+#define XFA_FWL_CFWL_SPINBUTTON_H_
 
 #include <memory>
 
-#include "xfa/fwl/core/cfwl_timer.h"
-#include "xfa/fwl/core/cfwl_widget.h"
+#include "xfa/fwl/cfwl_timer.h"
+#include "xfa/fwl/cfwl_widget.h"
 #include "xfa/fxfa/cxfa_eventparam.h"
 
 #define FWL_STYLEEXE_SPB_Vert (1L << 0)
 
-class CFWL_MsgMouse;
+class CFWL_MessageMouse;
 class CFWL_WidgetProperties;
 
 class CFWL_SpinButton : public CFWL_Widget {
  public:
   CFWL_SpinButton(const CFWL_App* app,
                   std::unique_ptr<CFWL_WidgetProperties> properties);
   ~CFWL_SpinButton() override;
 
   // CFWL_Widget
   FWL_Type GetClassID() const override;
@@ skipping 17 matching lines @@
   void DisableButton();
   bool IsUpButtonEnabled();
   bool IsDownButtonEnabled();
   void DrawUpButton(CFX_Graphics* pGraphics,
                     IFWL_ThemeProvider* pTheme,
                     const CFX_Matrix* pMatrix);
   void DrawDownButton(CFX_Graphics* pGraphics,
                       IFWL_ThemeProvider* pTheme,
                       const CFX_Matrix* pMatrix);
   void OnFocusChanged(CFWL_Message* pMsg, bool bSet);
-  void OnLButtonDown(CFWL_MsgMouse* pMsg);
-  void OnLButtonUp(CFWL_MsgMouse* pMsg);
-  void OnMouseMove(CFWL_MsgMouse* pMsg);
-  void OnMouseLeave(CFWL_MsgMouse* pMsg);
-  void OnKeyDown(CFWL_MsgKey* pMsg);
+  void OnLButtonDown(CFWL_MessageMouse* pMsg);
+  void OnLButtonUp(CFWL_MessageMouse* pMsg);
+  void OnMouseMove(CFWL_MessageMouse* pMsg);
+  void OnMouseLeave(CFWL_MessageMouse* pMsg);
+  void OnKeyDown(CFWL_MessageKey* pMsg);
 
   CFX_RectF m_rtClient;
   CFX_RectF m_rtUpButton;
   CFX_RectF m_rtDnButton;
   uint32_t m_dwUpState;
   uint32_t m_dwDnState;
   int32_t m_iButtonIndex;
   bool m_bLButtonDwn;
   CFWL_TimerInfo* m_pTimerInfo;
   CFWL_SpinButton::Timer m_Timer;
 };
 
-#endif  // XFA_FWL_CORE_CFWL_SPINBUTTON_H_
+#endif  // XFA_FWL_CFWL_SPINBUTTON_H_