From 202ad7238489934ba0c64760de5f95782b36a213 Mon Sep 17 00:00:00 2001
From: dsinclair <dsinclair@chromium.org>
Date: Thu, 29 Sep 2016 17:41:42 -0700
Subject: Move xfa/{fwl,fxbarcode,fxgraphics}/include up to parent

BUG=pdfium:611

Review-Url: https://codereview.chromium.org/2383583002
---
 xfa/fwl/core/cfwl_widgetmgr.h               |  2 +-
 xfa/fwl/core/fwl_noteimp.h                  |  2 +-
 xfa/fwl/core/fwl_timerimp.cpp               |  2 +-
 xfa/fwl/core/fwl_widgethit.h                | 35 +++++++++++++++++++++++++++++
 xfa/fwl/core/fwl_widgetimp.h                |  2 +-
 xfa/fwl/core/ifwl_adaptertimermgr.h         | 23 +++++++++++++++++++
 xfa/fwl/core/include/fwl_widgethit.h        | 35 -----------------------------
 xfa/fwl/core/include/ifwl_adaptertimermgr.h | 23 -------------------
 8 files changed, 62 insertions(+), 62 deletions(-)
 create mode 100644 xfa/fwl/core/fwl_widgethit.h
 create mode 100644 xfa/fwl/core/ifwl_adaptertimermgr.h
 delete mode 100644 xfa/fwl/core/include/fwl_widgethit.h
 delete mode 100644 xfa/fwl/core/include/ifwl_adaptertimermgr.h

(limited to 'xfa/fwl/core')

diff --git a/xfa/fwl/core/cfwl_widgetmgr.h b/xfa/fwl/core/cfwl_widgetmgr.h
index c528889f77..e0188bd600 100644
--- a/xfa/fwl/core/cfwl_widgetmgr.h
+++ b/xfa/fwl/core/cfwl_widgetmgr.h
@@ -12,7 +12,7 @@
 
 #include "core/fxcrt/fx_system.h"
 #include "xfa/fwl/core/fwl_error.h"
-#include "xfa/fxgraphics/include/cfx_graphics.h"
+#include "xfa/fxgraphics/cfx_graphics.h"
 
 #define FWL_WGTMGR_DisableThread 0x00000001
 #define FWL_WGTMGR_DisableForm 0x00000002
diff --git a/xfa/fwl/core/fwl_noteimp.h b/xfa/fwl/core/fwl_noteimp.h
index f923c395d5..9a0723de7b 100644
--- a/xfa/fwl/core/fwl_noteimp.h
+++ b/xfa/fwl/core/fwl_noteimp.h
@@ -14,7 +14,7 @@
 #include "xfa/fwl/core/cfwl_message.h"
 #include "xfa/fwl/core/fwl_error.h"
 #include "xfa/fwl/core/ifwl_widget.h"
-#include "xfa/fxgraphics/include/cfx_graphics.h"
+#include "xfa/fxgraphics/cfx_graphics.h"
 
 enum FWL_KeyFlag {
   FWL_KEYFLAG_Ctrl = 1 << 0,
diff --git a/xfa/fwl/core/fwl_timerimp.cpp b/xfa/fwl/core/fwl_timerimp.cpp
index 22b28c8c67..0fcbc24b01 100644
--- a/xfa/fwl/core/fwl_timerimp.cpp
+++ b/xfa/fwl/core/fwl_timerimp.cpp
@@ -5,9 +5,9 @@
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "xfa/fwl/core/fwl_appimp.h"
+#include "xfa/fwl/core/ifwl_adaptertimermgr.h"
 #include "xfa/fwl/core/ifwl_app.h"
 #include "xfa/fwl/core/ifwl_timer.h"
-#include "xfa/fwl/core/include/ifwl_adaptertimermgr.h"
 #include "xfa/fxfa/include/xfa_ffapp.h"
 
 IFWL_TimerInfo* IFWL_Timer::StartTimer(uint32_t dwElapse, bool bImmediately) {
diff --git a/xfa/fwl/core/fwl_widgethit.h b/xfa/fwl/core/fwl_widgethit.h
new file mode 100644
index 0000000000..3adecfe49e
--- /dev/null
+++ b/xfa/fwl/core/fwl_widgethit.h
@@ -0,0 +1,35 @@
+// Copyright 2016 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_FWL_WIDGETHIT_H_
+#define XFA_FWL_CORE_FWL_WIDGETHIT_H_
+
+enum class FWL_WidgetHit {
+  Unknown = 0,
+  Client,
+  Left,
+  Top,
+  Right,
+  Bottom,
+  LeftTop,
+  RightTop,
+  LeftBottom,
+  RightBottom,
+  Titlebar,
+  MinBox,
+  MaxBox,
+  CloseBox,
+  HScrollBar,
+  VScrollBar,
+  Border,
+  Edge,
+  Edit,
+  HyperLink,
+  UpButton,
+  DownButton
+};
+
+#endif  // XFA_FWL_CORE_FWL_WIDGETHIT_H_
diff --git a/xfa/fwl/core/fwl_widgetimp.h b/xfa/fwl/core/fwl_widgetimp.h
index 0c8f643a0f..57970a87eb 100644
--- a/xfa/fwl/core/fwl_widgetimp.h
+++ b/xfa/fwl/core/fwl_widgetimp.h
@@ -13,8 +13,8 @@
 #include "core/fxcrt/fx_system.h"
 #include "xfa/fwl/core/cfwl_event.h"
 #include "xfa/fwl/core/cfwl_themepart.h"
+#include "xfa/fwl/core/fwl_widgethit.h"
 #include "xfa/fwl/core/ifwl_widgetdelegate.h"
-#include "xfa/fwl/core/include/fwl_widgethit.h"
 #include "xfa/fwl/theme/cfwl_widgettp.h"
 
 class CFWL_AppImp;
diff --git a/xfa/fwl/core/ifwl_adaptertimermgr.h b/xfa/fwl/core/ifwl_adaptertimermgr.h
new file mode 100644
index 0000000000..ef5ebba59b
--- /dev/null
+++ b/xfa/fwl/core/ifwl_adaptertimermgr.h
@@ -0,0 +1,23 @@
+// 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_IFWL_ADAPTERTIMERMGR_H_
+#define XFA_FWL_CORE_IFWL_ADAPTERTIMERMGR_H_
+
+#include "xfa/fwl/core/fwl_error.h"
+#include "xfa/fwl/core/ifwl_timer.h"
+
+class IFWL_AdapterTimerMgr {
+ public:
+  virtual ~IFWL_AdapterTimerMgr() {}
+  virtual FWL_Error Start(IFWL_Timer* pTimer,
+                          uint32_t dwElapse,
+                          bool bImmediately,
+                          IFWL_TimerInfo** pTimerInfo) = 0;
+  virtual FWL_Error Stop(IFWL_TimerInfo* pTimerInfo) = 0;
+};
+
+#endif  // XFA_FWL_CORE_IFWL_ADAPTERTIMERMGR_H_
diff --git a/xfa/fwl/core/include/fwl_widgethit.h b/xfa/fwl/core/include/fwl_widgethit.h
deleted file mode 100644
index 102024a510..0000000000
--- a/xfa/fwl/core/include/fwl_widgethit.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2016 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_INCLUDE_FWL_WIDGETHIT_H_
-#define XFA_FWL_CORE_INCLUDE_FWL_WIDGETHIT_H_
-
-enum class FWL_WidgetHit {
-  Unknown = 0,
-  Client,
-  Left,
-  Top,
-  Right,
-  Bottom,
-  LeftTop,
-  RightTop,
-  LeftBottom,
-  RightBottom,
-  Titlebar,
-  MinBox,
-  MaxBox,
-  CloseBox,
-  HScrollBar,
-  VScrollBar,
-  Border,
-  Edge,
-  Edit,
-  HyperLink,
-  UpButton,
-  DownButton
-};
-
-#endif  // XFA_FWL_CORE_INCLUDE_FWL_WIDGETHIT_H_
diff --git a/xfa/fwl/core/include/ifwl_adaptertimermgr.h b/xfa/fwl/core/include/ifwl_adaptertimermgr.h
deleted file mode 100644
index 111c3ebf84..0000000000
--- a/xfa/fwl/core/include/ifwl_adaptertimermgr.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// 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_INCLUDE_IFWL_ADAPTERTIMERMGR_H_
-#define XFA_FWL_CORE_INCLUDE_IFWL_ADAPTERTIMERMGR_H_
-
-#include "xfa/fwl/core/fwl_error.h"
-#include "xfa/fwl/core/ifwl_timer.h"
-
-class IFWL_AdapterTimerMgr {
- public:
-  virtual ~IFWL_AdapterTimerMgr() {}
-  virtual FWL_Error Start(IFWL_Timer* pTimer,
-                          uint32_t dwElapse,
-                          bool bImmediately,
-                          IFWL_TimerInfo** pTimerInfo) = 0;
-  virtual FWL_Error Stop(IFWL_TimerInfo* pTimerInfo) = 0;
-};
-
-#endif  // XFA_FWL_CORE_INCLUDE_IFWL_ADAPTERTIMERMGR_H_
-- 
cgit v1.2.3