Move xfa/fwl/core to xfa/fwl.

xfa/fwl/cfwl_scrollbar.h

Index: xfa/fwl/cfwl_scrollbar.h
diff --git a/xfa/fwl/core/cfwl_scrollbar.h b/xfa/fwl/cfwl_scrollbar.h
similarity index 91%
rename from xfa/fwl/core/cfwl_scrollbar.h
rename to xfa/fwl/cfwl_scrollbar.h
index f1eb35b3273107bdeb97a3030c1bb308ea195979..808975ed81b630cf83987fcaa69461f977ea56b7 100644
--- a/xfa/fwl/core/cfwl_scrollbar.h
+++ b/xfa/fwl/cfwl_scrollbar.h
@@ -4,16 +4,16 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_CFWL_SCROLLBAR_H_
-#define XFA_FWL_CORE_CFWL_SCROLLBAR_H_
+#ifndef XFA_FWL_CFWL_SCROLLBAR_H_
+#define XFA_FWL_CFWL_SCROLLBAR_H_
 
 #include <memory>
 
 #include "core/fxcrt/fx_system.h"
-#include "xfa/fwl/core/cfwl_evtscroll.h"
-#include "xfa/fwl/core/cfwl_timer.h"
-#include "xfa/fwl/core/cfwl_widget.h"
-#include "xfa/fwl/core/cfwl_widgetproperties.h"
+#include "xfa/fwl/cfwl_eventscroll.h"
+#include "xfa/fwl/cfwl_timer.h"
+#include "xfa/fwl/cfwl_widget.h"
+#include "xfa/fwl/cfwl_widgetproperties.h"
 
 class CFWL_Widget;
 
@@ -87,7 +87,7 @@ class CFWL_ScrollBar : public CFWL_Widget {
   FX_FLOAT GetTrackPointPos(FX_FLOAT fx, FX_FLOAT fy);
 
   bool SendEvent();
-  bool OnScroll(CFWL_EvtScroll::Code dwCode, FX_FLOAT fPos);
+  bool OnScroll(CFWL_EventScroll::Code dwCode, FX_FLOAT fPos);
   void OnLButtonDown(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy);
   void OnLButtonUp(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy);
   void OnMouseMove(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy);
@@ -97,7 +97,7 @@ class CFWL_ScrollBar : public CFWL_Widget {
                     uint32_t dwFlags,
                     FX_FLOAT fDeltaX,
                     FX_FLOAT fDeltaY);
-  bool DoScroll(CFWL_EvtScroll::Code dwCode, FX_FLOAT fPos);
+  bool DoScroll(CFWL_EventScroll::Code dwCode, FX_FLOAT fPos);
   void DoMouseDown(int32_t iItem,
                    const CFX_RectF& rtItem,
                    int32_t& iState,
@@ -145,4 +145,4 @@ class CFWL_ScrollBar : public CFWL_Widget {
   CFWL_ScrollBar::Timer m_Timer;
 };
 
-#endif  // XFA_FWL_CORE_CFWL_SCROLLBAR_H_
+#endif  // XFA_FWL_CFWL_SCROLLBAR_H_