From a52ab741019342fbca0468e43a01deb44fa5f1bd Mon Sep 17 00:00:00 2001 From: dsinclair Date: Thu, 29 Sep 2016 13:59:29 -0700 Subject: Move core/fxcrt/include to core/fxcrt BUG=pdfium:611 Review-Url: https://codereview.chromium.org/2382723003 --- xfa/fwl/core/cfwl_event.h | 6 +++--- xfa/fwl/core/cfwl_message.h | 4 ++-- xfa/fwl/core/cfwl_themepart.h | 4 ++-- xfa/fwl/core/cfwl_themetext.h | 4 ++-- xfa/fwl/core/cfwl_widgetimpproperties.h | 4 ++-- xfa/fwl/core/cfwl_widgetmgr.h | 2 +- xfa/fwl/core/fwl_noteimp.cpp | 2 +- xfa/fwl/core/fwl_widgetimp.h | 4 ++-- xfa/fwl/core/ifwl_app.h | 2 +- xfa/fwl/core/ifwl_dataprovider.h | 2 +- xfa/fwl/core/ifwl_form.h | 2 +- xfa/fwl/core/ifwl_themeprovider.h | 4 ++-- xfa/fwl/core/ifwl_timer.h | 2 +- xfa/fwl/core/ifwl_widget.h | 6 +++--- 14 files changed, 24 insertions(+), 24 deletions(-) (limited to 'xfa/fwl/core') diff --git a/xfa/fwl/core/cfwl_event.h b/xfa/fwl/core/cfwl_event.h index 4d208d0d46..3ef81ff3ba 100644 --- a/xfa/fwl/core/cfwl_event.h +++ b/xfa/fwl/core/cfwl_event.h @@ -7,9 +7,9 @@ #ifndef XFA_FWL_CORE_CFWL_EVENT_H_ #define XFA_FWL_CORE_CFWL_EVENT_H_ -#include "core/fxcrt/include/fx_coordinates.h" -#include "core/fxcrt/include/fx_string.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_coordinates.h" +#include "core/fxcrt/fx_string.h" +#include "core/fxcrt/fx_system.h" #include "xfa/fwl/core/cfwl_message.h" #include "xfa/fwl/core/fwl_error.h" diff --git a/xfa/fwl/core/cfwl_message.h b/xfa/fwl/core/cfwl_message.h index db434fc1fb..6089fdcf4f 100644 --- a/xfa/fwl/core/cfwl_message.h +++ b/xfa/fwl/core/cfwl_message.h @@ -7,8 +7,8 @@ #ifndef XFA_FWL_CORE_CFWL_MESSAGE_H_ #define XFA_FWL_CORE_CFWL_MESSAGE_H_ -#include "core/fxcrt/include/fx_string.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_string.h" +#include "core/fxcrt/fx_system.h" #include "xfa/fwl/core/fwl_error.h" enum class CFWL_MessageType { diff --git a/xfa/fwl/core/cfwl_themepart.h b/xfa/fwl/core/cfwl_themepart.h index c5e6cd7ff5..1b2c706274 100644 --- a/xfa/fwl/core/cfwl_themepart.h +++ b/xfa/fwl/core/cfwl_themepart.h @@ -7,8 +7,8 @@ #ifndef XFA_FWL_CORE_CFWL_THEMEPART_H_ #define XFA_FWL_CORE_CFWL_THEMEPART_H_ -#include "core/fxcrt/include/fx_coordinates.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_coordinates.h" +#include "core/fxcrt/fx_system.h" enum class CFWL_Part { None = 0, diff --git a/xfa/fwl/core/cfwl_themetext.h b/xfa/fwl/core/cfwl_themetext.h index c8929bd1f0..b570ca814d 100644 --- a/xfa/fwl/core/cfwl_themetext.h +++ b/xfa/fwl/core/cfwl_themetext.h @@ -7,8 +7,8 @@ #ifndef XFA_FWL_CORE_CFWL_THEMETEXT_H_ #define XFA_FWL_CORE_CFWL_THEMETEXT_H_ -#include "core/fxcrt/include/fx_string.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_string.h" +#include "core/fxcrt/fx_system.h" #include "xfa/fwl/core/cfwl_themepart.h" class CFWL_ThemeText : public CFWL_ThemePart { diff --git a/xfa/fwl/core/cfwl_widgetimpproperties.h b/xfa/fwl/core/cfwl_widgetimpproperties.h index 71b0368311..4d7dee6834 100644 --- a/xfa/fwl/core/cfwl_widgetimpproperties.h +++ b/xfa/fwl/core/cfwl_widgetimpproperties.h @@ -7,8 +7,8 @@ #ifndef XFA_FWL_CORE_CFWL_WIDGETIMPPROPERTIES_H_ #define XFA_FWL_CORE_CFWL_WIDGETIMPPROPERTIES_H_ -#include "core/fxcrt/include/fx_coordinates.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_coordinates.h" +#include "core/fxcrt/fx_system.h" #include "xfa/fwl/core/fwl_widgetdef.h" class IFWL_DataProvider; diff --git a/xfa/fwl/core/cfwl_widgetmgr.h b/xfa/fwl/core/cfwl_widgetmgr.h index 346785fd97..c528889f77 100644 --- a/xfa/fwl/core/cfwl_widgetmgr.h +++ b/xfa/fwl/core/cfwl_widgetmgr.h @@ -10,7 +10,7 @@ #include #include -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_system.h" #include "xfa/fwl/core/fwl_error.h" #include "xfa/fxgraphics/include/cfx_graphics.h" diff --git a/xfa/fwl/core/fwl_noteimp.cpp b/xfa/fwl/core/fwl_noteimp.cpp index 8ecec2df65..3173f3e4db 100644 --- a/xfa/fwl/core/fwl_noteimp.cpp +++ b/xfa/fwl/core/fwl_noteimp.cpp @@ -6,7 +6,7 @@ #include "xfa/fwl/core/fwl_noteimp.h" -#include "core/fxcrt/include/fx_ext.h" +#include "core/fxcrt/fx_ext.h" #include "third_party/base/stl_util.h" #include "xfa/fwl/basewidget/fwl_tooltipctrlimp.h" #include "xfa/fwl/basewidget/ifwl_tooltip.h" diff --git a/xfa/fwl/core/fwl_widgetimp.h b/xfa/fwl/core/fwl_widgetimp.h index cbc89b9a8b..0c8f643a0f 100644 --- a/xfa/fwl/core/fwl_widgetimp.h +++ b/xfa/fwl/core/fwl_widgetimp.h @@ -9,8 +9,8 @@ #include -#include "core/fxcrt/include/fx_coordinates.h" -#include "core/fxcrt/include/fx_system.h" +#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/ifwl_widgetdelegate.h" diff --git a/xfa/fwl/core/ifwl_app.h b/xfa/fwl/core/ifwl_app.h index 27c65c8317..03d44796fd 100644 --- a/xfa/fwl/core/ifwl_app.h +++ b/xfa/fwl/core/ifwl_app.h @@ -17,7 +17,7 @@ #include -#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/fx_string.h" #include "xfa/fwl/core/fwl_appimp.h" #include "xfa/fwl/core/fwl_error.h" diff --git a/xfa/fwl/core/ifwl_dataprovider.h b/xfa/fwl/core/ifwl_dataprovider.h index 5643a3d079..9a3634c40e 100644 --- a/xfa/fwl/core/ifwl_dataprovider.h +++ b/xfa/fwl/core/ifwl_dataprovider.h @@ -7,7 +7,7 @@ #ifndef XFA_FWL_CORE_IFWL_DATAPROVIDER_H_ #define XFA_FWL_CORE_IFWL_DATAPROVIDER_H_ -#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/fx_string.h" #include "xfa/fwl/core/fwl_error.h" class IFWL_Widget; diff --git a/xfa/fwl/core/ifwl_form.h b/xfa/fwl/core/ifwl_form.h index 13eb9d31f4..860cbd679d 100644 --- a/xfa/fwl/core/ifwl_form.h +++ b/xfa/fwl/core/ifwl_form.h @@ -7,7 +7,7 @@ #ifndef XFA_FWL_CORE_IFWL_FORM_H_ #define XFA_FWL_CORE_IFWL_FORM_H_ -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_system.h" #include "xfa/fwl/core/cfwl_widgetimpproperties.h" #include "xfa/fwl/core/ifwl_dataprovider.h" #include "xfa/fwl/core/ifwl_widget.h" diff --git a/xfa/fwl/core/ifwl_themeprovider.h b/xfa/fwl/core/ifwl_themeprovider.h index 274b27958a..06f64ba302 100644 --- a/xfa/fwl/core/ifwl_themeprovider.h +++ b/xfa/fwl/core/ifwl_themeprovider.h @@ -7,8 +7,8 @@ #ifndef XFA_FWL_CORE_IFWL_THEMEPROVIDER_H_ #define XFA_FWL_CORE_IFWL_THEMEPROVIDER_H_ -#include "core/fxcrt/include/fx_coordinates.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_coordinates.h" +#include "core/fxcrt/fx_system.h" #include "xfa/fwl/core/fwl_error.h" #include "xfa/fwl/theme/cfwl_widgettp.h" diff --git a/xfa/fwl/core/ifwl_timer.h b/xfa/fwl/core/ifwl_timer.h index 162fef9692..9c1c56dd73 100644 --- a/xfa/fwl/core/ifwl_timer.h +++ b/xfa/fwl/core/ifwl_timer.h @@ -7,7 +7,7 @@ #ifndef XFA_FWL_CORE_IFWL_TIMER_H_ #define XFA_FWL_CORE_IFWL_TIMER_H_ -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_system.h" #include "xfa/fwl/core/fwl_error.h" class IFWL_TimerInfo; diff --git a/xfa/fwl/core/ifwl_widget.h b/xfa/fwl/core/ifwl_widget.h index 21099921e8..ac213fefae 100644 --- a/xfa/fwl/core/ifwl_widget.h +++ b/xfa/fwl/core/ifwl_widget.h @@ -9,9 +9,9 @@ #include -#include "core/fxcrt/include/fx_basic.h" -#include "core/fxcrt/include/fx_coordinates.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_basic.h" +#include "core/fxcrt/fx_coordinates.h" +#include "core/fxcrt/fx_system.h" #include "xfa/fwl/core/fwl_error.h" #include "xfa/fwl/core/fwl_widgetimp.h" -- cgit v1.2.3