Move xfa/include/fwl/{core,basewidget} to xfa/fwl/{core,basewidget}.

xfa/fwl/core/ifwl_widgetmgr.h

Index: xfa/fwl/core/ifwl_widgetmgr.h
diff --git a/xfa/include/fwl/core/fwl_widgetmgr.h b/xfa/fwl/core/ifwl_widgetmgr.h
similarity index 68%
rename from xfa/include/fwl/core/fwl_widgetmgr.h
rename to xfa/fwl/core/ifwl_widgetmgr.h
index 9486af5ef7069635ce372473aa41080f0bf6c8d1..5ff11f3592bfdc897e3b4a4216acce6aa8fb3f9e 100644
--- a/xfa/include/fwl/core/fwl_widgetmgr.h
+++ b/xfa/fwl/core/ifwl_widgetmgr.h
@@ -4,16 +4,17 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_INCLUDE_FWL_CORE_FWL_WIDGETMGR_H_
-#define XFA_INCLUDE_FWL_CORE_FWL_WIDGETMGR_H_
+#ifndef XFA_FWL_CORE_IFWL_WIDGETMGR_H_
+#define XFA_FWL_CORE_IFWL_WIDGETMGR_H_
 
-#include "xfa/include/fwl/core/fwl_note.h"
+#include "core/fxcrt/include/fx_system.h"
+#include "xfa/fwl/core/fwl_error.h"
+#include "core/fxcrt/include/fx_coordinates.h"
 
+class CFX_WideString;
+class CFX_Matrix;
 class IFWL_Widget;
 
-#define FWL_WGTMGR_DisableThread 0x00000001
-#define FWL_WGTMGR_DisableForm 0x00000002
-
 enum FWL_WGTRELATION {
   FWL_WGTRELATION_Parent = 0,
   FWL_WGTRELATION_Owner,
@@ -40,21 +41,11 @@ class IFWL_WidgetMgr {
                                 const CFX_RectF* pRect = NULL) = 0;
   virtual FX_DWORD GetCapability() = 0;
 };
+
 IFWL_WidgetMgr* FWL_GetWidgetMgr();
 FX_BOOL FWL_WidgetIsChild(IFWL_Widget* parent, IFWL_Widget* find);
-
-class IFWL_WidgetMgrDelegate {
- public:
-  virtual ~IFWL_WidgetMgrDelegate() {}
-  virtual FWL_ERR OnSetCapability(
-      FX_DWORD dwCapability = FWL_WGTMGR_DisableThread) = 0;
-  virtual int32_t OnProcessMessageToForm(CFWL_Message* pMessage) = 0;
-  virtual FWL_ERR OnDrawWidget(IFWL_Widget* pWidget,
-                               CFX_Graphics* pGraphics,
-                               const CFX_Matrix* pMatrix = NULL) = 0;
-};
 FWL_ERR FWL_WidgetMgrSnapshot(IFWL_Widget* pWidget,
                               const CFX_WideString* saveFile,
                               const CFX_Matrix* pMatrix = NULL);
 
-#endif  // XFA_INCLUDE_FWL_CORE_FWL_WIDGETMGR_H_
+#endif  // XFA_FWL_CORE_IFWL_WIDGETMGR_H_