From 1727aee85f22d9403e6cd8a0f786b9b7c0a2740a Mon Sep 17 00:00:00 2001
From: dsinclair <dsinclair@chromium.org>
Date: Thu, 29 Sep 2016 13:12:56 -0700
Subject: Move core/fpdfdoc/include to core/fpdfdoc

BUG=pdfium:611

Review-Url: https://codereview.chromium.org/2374383003
---
 fpdfsdk/pdfwindow/DEPS             | 2 +-
 fpdfsdk/pdfwindow/PWL_Edit.cpp     | 2 +-
 fpdfsdk/pdfwindow/PWL_EditCtrl.cpp | 4 ++--
 fpdfsdk/pdfwindow/PWL_FontMap.cpp  | 2 +-
 fpdfsdk/pdfwindow/PWL_FontMap.h    | 2 +-
 fpdfsdk/pdfwindow/PWL_Utils.cpp    | 2 +-
 fpdfsdk/pdfwindow/PWL_Utils.h      | 2 +-
 fpdfsdk/pdfwindow/PWL_Wnd.h        | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'fpdfsdk/pdfwindow')

diff --git a/fpdfsdk/pdfwindow/DEPS b/fpdfsdk/pdfwindow/DEPS
index 973ea055cf..a8612e1c54 100644
--- a/fpdfsdk/pdfwindow/DEPS
+++ b/fpdfsdk/pdfwindow/DEPS
@@ -1,4 +1,4 @@
 include_rules = [
   '+core/fpdfapi/fpdf_font',
-  '+core/fpdfdoc/include',
+  '+core/fpdfdoc',
 ]
diff --git a/fpdfsdk/pdfwindow/PWL_Edit.cpp b/fpdfsdk/pdfwindow/PWL_Edit.cpp
index fc7d04cdef..b87d3390ea 100644
--- a/fpdfsdk/pdfwindow/PWL_Edit.cpp
+++ b/fpdfsdk/pdfwindow/PWL_Edit.cpp
@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "core/fpdfapi/fpdf_font/cpdf_font.h"
-#include "core/fpdfdoc/include/cpvt_word.h"
+#include "core/fpdfdoc/cpvt_word.h"
 #include "core/fxcrt/include/fx_safe_types.h"
 #include "core/fxcrt/include/fx_xml.h"
 #include "core/fxge/include/cfx_graphstatedata.h"
diff --git a/fpdfsdk/pdfwindow/PWL_EditCtrl.cpp b/fpdfsdk/pdfwindow/PWL_EditCtrl.cpp
index 2ec88cb15e..c99af4d155 100644
--- a/fpdfsdk/pdfwindow/PWL_EditCtrl.cpp
+++ b/fpdfsdk/pdfwindow/PWL_EditCtrl.cpp
@@ -6,8 +6,8 @@
 
 #include "fpdfsdk/pdfwindow/PWL_EditCtrl.h"
 
-#include "core/fpdfdoc/include/cpvt_section.h"
-#include "core/fpdfdoc/include/cpvt_word.h"
+#include "core/fpdfdoc/cpvt_section.h"
+#include "core/fpdfdoc/cpvt_word.h"
 #include "core/fxge/include/fx_font.h"
 #include "fpdfsdk/fxedit/include/fxet_edit.h"
 #include "fpdfsdk/pdfwindow/PWL_Caret.h"
diff --git a/fpdfsdk/pdfwindow/PWL_FontMap.cpp b/fpdfsdk/pdfwindow/PWL_FontMap.cpp
index 6b719606a7..57feb27dcd 100644
--- a/fpdfsdk/pdfwindow/PWL_FontMap.cpp
+++ b/fpdfsdk/pdfwindow/PWL_FontMap.cpp
@@ -11,7 +11,7 @@
 #include "core/fpdfapi/fpdf_font/cpdf_fontencoding.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_document.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_parser.h"
-#include "core/fpdfdoc/include/ipvt_fontmap.h"
+#include "core/fpdfdoc/ipvt_fontmap.h"
 #include "fpdfsdk/pdfwindow/PWL_Wnd.h"
 
 namespace {
diff --git a/fpdfsdk/pdfwindow/PWL_FontMap.h b/fpdfsdk/pdfwindow/PWL_FontMap.h
index bb3925d5c2..3dcd33919f 100644
--- a/fpdfsdk/pdfwindow/PWL_FontMap.h
+++ b/fpdfsdk/pdfwindow/PWL_FontMap.h
@@ -9,7 +9,7 @@
 
 #include <memory>
 
-#include "core/fpdfdoc/include/ipvt_fontmap.h"
+#include "core/fpdfdoc/ipvt_fontmap.h"
 #include "core/fxge/include/fx_font.h"
 #include "fpdfsdk/fxedit/include/fx_edit.h"
 #include "public/fpdf_sysfontinfo.h"
diff --git a/fpdfsdk/pdfwindow/PWL_Utils.cpp b/fpdfsdk/pdfwindow/PWL_Utils.cpp
index 7c7e05af00..4b19fd5927 100644
--- a/fpdfsdk/pdfwindow/PWL_Utils.cpp
+++ b/fpdfsdk/pdfwindow/PWL_Utils.cpp
@@ -8,7 +8,7 @@
 
 #include <algorithm>
 
-#include "core/fpdfdoc/include/cpvt_word.h"
+#include "core/fpdfdoc/cpvt_word.h"
 #include "core/fxge/include/cfx_graphstatedata.h"
 #include "core/fxge/include/cfx_pathdata.h"
 #include "core/fxge/include/cfx_renderdevice.h"
diff --git a/fpdfsdk/pdfwindow/PWL_Utils.h b/fpdfsdk/pdfwindow/PWL_Utils.h
index d7c65d2a8a..bdcba968a6 100644
--- a/fpdfsdk/pdfwindow/PWL_Utils.h
+++ b/fpdfsdk/pdfwindow/PWL_Utils.h
@@ -7,7 +7,7 @@
 #ifndef FPDFSDK_PDFWINDOW_PWL_UTILS_H_
 #define FPDFSDK_PDFWINDOW_PWL_UTILS_H_
 
-#include "core/fpdfdoc/include/cpvt_wordrange.h"
+#include "core/fpdfdoc/cpvt_wordrange.h"
 #include "fpdfsdk/pdfwindow/PWL_Wnd.h"
 
 class CFX_Edit;
diff --git a/fpdfsdk/pdfwindow/PWL_Wnd.h b/fpdfsdk/pdfwindow/PWL_Wnd.h
index ca2b4c77da..37209ed8f8 100644
--- a/fpdfsdk/pdfwindow/PWL_Wnd.h
+++ b/fpdfsdk/pdfwindow/PWL_Wnd.h
@@ -10,7 +10,7 @@
 #include <memory>
 #include <vector>
 
-#include "core/fpdfdoc/include/cpdf_formcontrol.h"
+#include "core/fpdfdoc/cpdf_formcontrol.h"
 #include "core/fxcrt/include/fx_basic.h"
 #include "fpdfsdk/cfx_systemhandler.h"
 
-- 
cgit v1.2.3