Move include/fxcodec to fxcodec/include

Review URL: https://codereview.chromium.org/1864153002

14 files changed, 15 insertions, 15 deletions

diff --git a/core/fxcodec/codec/codec_int.h b/core/fxcodec/codec/codec_int.h
index 7f0aaef379..ed9bcac349 100644
--- a/core/fxcodec/codec/codec_int.h
+++ b/core/fxcodec/codec/codec_int.h
@@ -14,8 +14,8 @@
 #include <memory>
 #include <vector>
 
+#include "core/fxcodec/include/fx_codec.h"
 #include "core/fxcodec/jbig2/JBig2_Context.h"
-#include "core/include/fxcodec/fx_codec.h"
 #include "third_party/libopenjpeg20/openjpeg.h"  // For OPJ_SIZE_T.
 
 class CFX_IccProfileCache;
diff --git a/core/fxcodec/codec/fx_codec.cpp b/core/fxcodec/codec/fx_codec.cpp
index ef9414dbe5..77dd363c9d 100644
--- a/core/fxcodec/codec/fx_codec.cpp
+++ b/core/fxcodec/codec/fx_codec.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/include/fxcodec/fx_codec.h"
+#include "core/fxcodec/include/fx_codec.h"
 
 #include <cmath>
 #include <utility>
diff --git a/core/fxcodec/codec/fx_codec_bmp.cpp b/core/fxcodec/codec/fx_codec_bmp.cpp
index 2dc537161b..0fed151217 100644
--- a/core/fxcodec/codec/fx_codec_bmp.cpp
+++ b/core/fxcodec/codec/fx_codec_bmp.cpp
@@ -5,9 +5,9 @@
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "core/fxcodec/codec/codec_int.h"
+#include "core/fxcodec/include/fx_codec.h"
 #include "core/fxcodec/lbmp/fx_bmp.h"
 #include "core/fxge/include/fx_dib.h"
-#include "core/include/fxcodec/fx_codec.h"
 struct FXBMP_Context {
   bmp_decompress_struct_p bmp_ptr;
   void* parent_ptr;
diff --git a/core/fxcodec/codec/fx_codec_fax.cpp b/core/fxcodec/codec/fx_codec_fax.cpp
index 6b90b15e51..898b0d0251 100644
--- a/core/fxcodec/codec/fx_codec_fax.cpp
+++ b/core/fxcodec/codec/fx_codec_fax.cpp
@@ -5,7 +5,7 @@
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "core/fxcodec/codec/codec_int.h"
-#include "core/include/fxcodec/fx_codec.h"
+#include "core/fxcodec/include/fx_codec.h"
 
 namespace {
 
diff --git a/core/fxcodec/codec/fx_codec_flate.cpp b/core/fxcodec/codec/fx_codec_flate.cpp
index 2350eb1a88..16cde3e5ea 100644
--- a/core/fxcodec/codec/fx_codec_flate.cpp
+++ b/core/fxcodec/codec/fx_codec_flate.cpp
@@ -9,9 +9,9 @@
 #include <algorithm>
 #include <memory>
 
+#include "core/fxcodec/include/fx_codec.h"
+#include "core/fxcodec/include/fx_codec_flate.h"
 #include "core/fxcrt/include/fx_ext.h"
-#include "core/include/fxcodec/fx_codec.h"
-#include "core/include/fxcodec/fx_codec_flate.h"
 #include "third_party/zlib_v128/zlib.h"
 
 extern "C" {
diff --git a/core/fxcodec/codec/fx_codec_gif.cpp b/core/fxcodec/codec/fx_codec_gif.cpp
index e1806a4001..5fc0d094d8 100644
--- a/core/fxcodec/codec/fx_codec_gif.cpp
+++ b/core/fxcodec/codec/fx_codec_gif.cpp
@@ -5,9 +5,9 @@
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "core/fxcodec/codec/codec_int.h"
+#include "core/fxcodec/include/fx_codec.h"
 #include "core/fxcodec/lgif/fx_gif.h"
 #include "core/fxge/include/fx_dib.h"
-#include "core/include/fxcodec/fx_codec.h"
 struct FXGIF_Context {
   gif_decompress_struct_p gif_ptr;
   void* parent_ptr;
diff --git a/core/fxcodec/codec/fx_codec_icc.cpp b/core/fxcodec/codec/fx_codec_icc.cpp
index 13280d7f49..74801e57a0 100644
--- a/core/fxcodec/codec/fx_codec_icc.cpp
+++ b/core/fxcodec/codec/fx_codec_icc.cpp
@@ -5,7 +5,7 @@
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "core/fxcodec/codec/codec_int.h"
-#include "core/include/fxcodec/fx_codec.h"
+#include "core/fxcodec/include/fx_codec.h"
 #include "third_party/lcms2-2.6/include/lcms2.h"
 
 const uint32_t N_COMPONENT_LAB = 3;
diff --git a/core/fxcodec/codec/fx_codec_jbig.cpp b/core/fxcodec/codec/fx_codec_jbig.cpp
index ddcec6c6bb..96f6836190 100644
--- a/core/fxcodec/codec/fx_codec_jbig.cpp
+++ b/core/fxcodec/codec/fx_codec_jbig.cpp
@@ -7,7 +7,7 @@
 #include <list>
 
 #include "core/fxcodec/codec/codec_int.h"
-#include "core/include/fxcodec/fx_codec.h"
+#include "core/fxcodec/include/fx_codec.h"
 
 // Holds per-document JBig2 related data.
 class JBig2DocumentContext : public CFX_DestructObject {
diff --git a/core/fxcodec/codec/fx_codec_jpeg.cpp b/core/fxcodec/codec/fx_codec_jpeg.cpp
index 33ebf1ba20..9a2a0ee4a3 100644
--- a/core/fxcodec/codec/fx_codec_jpeg.cpp
+++ b/core/fxcodec/codec/fx_codec_jpeg.cpp
@@ -7,9 +7,9 @@
 #include <setjmp.h>
 
 #include "core/fxcodec/codec/codec_int.h"
+#include "core/fxcodec/include/fx_codec.h"
 #include "core/fxcrt/include/fx_safe_types.h"
 #include "core/fxge/include/fx_dib.h"
-#include "core/include/fxcodec/fx_codec.h"
 
 extern "C" {
 #undef FAR
diff --git a/core/fxcodec/codec/fx_codec_jpx_opj.cpp b/core/fxcodec/codec/fx_codec_jpx_opj.cpp
index 18d2c8d827..85b0b767ac 100644
--- a/core/fxcodec/codec/fx_codec_jpx_opj.cpp
+++ b/core/fxcodec/codec/fx_codec_jpx_opj.cpp
@@ -10,8 +10,8 @@
 
 #include "core/fpdfapi/fpdf_page/include/cpdf_colorspace.h"
 #include "core/fxcodec/codec/codec_int.h"
+#include "core/fxcodec/include/fx_codec.h"
 #include "core/fxcrt/include/fx_safe_types.h"
-#include "core/include/fxcodec/fx_codec.h"
 #include "third_party/lcms2-2.6/include/lcms2.h"
 #include "third_party/libopenjpeg20/openjpeg.h"
 
diff --git a/core/fxcodec/codec/fx_codec_png.cpp b/core/fxcodec/codec/fx_codec_png.cpp
index e625737e34..fd56c93393 100644
--- a/core/fxcodec/codec/fx_codec_png.cpp
+++ b/core/fxcodec/codec/fx_codec_png.cpp
@@ -7,8 +7,8 @@
 #include <algorithm>
 
 #include "core/fxcodec/codec/codec_int.h"
+#include "core/fxcodec/include/fx_codec.h"
 #include "core/fxge/include/fx_dib.h"
-#include "core/include/fxcodec/fx_codec.h"
 
 extern "C" {
 #undef FAR
diff --git a/core/fxcodec/codec/fx_codec_progress.cpp b/core/fxcodec/codec/fx_codec_progress.cpp
index ebd69ae1e3..89e4b25dbb 100644
--- a/core/fxcodec/codec/fx_codec_progress.cpp
+++ b/core/fxcodec/codec/fx_codec_progress.cpp
@@ -6,8 +6,8 @@
 
 #include "core/fxcodec/codec/fx_codec_progress.h"
 
+#include "core/fxcodec/include/fx_codec.h"
 #include "core/fxge/include/fx_dib.h"
-#include "core/include/fxcodec/fx_codec.h"
 
 void CFXCODEC_WeightTable::Calc(int dest_len,
                                 int dest_min,
diff --git a/core/fxcodec/codec/fx_codec_progress.h b/core/fxcodec/codec/fx_codec_progress.h
index 2b2ba28e16..e8e885b3b5 100644
--- a/core/fxcodec/codec/fx_codec_progress.h
+++ b/core/fxcodec/codec/fx_codec_progress.h
@@ -7,10 +7,10 @@
 #ifndef CORE_FXCODEC_CODEC_FX_CODEC_PROGRESS_H_
 #define CORE_FXCODEC_CODEC_FX_CODEC_PROGRESS_H_
 
+#include "core/fxcodec/include/fx_codec.h"
 #include "core/fxcrt/include/fx_memory.h"
 #include "core/fxcrt/include/fx_system.h"
 #include "core/fxge/include/fx_dib.h"
-#include "core/include/fxcodec/fx_codec.h"
 
 #define FXCODEC_BLOCK_SIZE 4096
 #define FXCODEC_PNG_GAMMA 2.2
diff --git a/core/fxcodec/codec/fx_codec_tiff.cpp b/core/fxcodec/codec/fx_codec_tiff.cpp
index d445769714..f0f2ab2e96 100644
--- a/core/fxcodec/codec/fx_codec_tiff.cpp
+++ b/core/fxcodec/codec/fx_codec_tiff.cpp
@@ -5,8 +5,8 @@
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "core/fxcodec/codec/codec_int.h"
+#include "core/fxcodec/include/fx_codec.h"
 #include "core/fxge/include/fx_dib.h"
-#include "core/include/fxcodec/fx_codec.h"
 
 extern "C" {
 #include "third_party/libtiff/tiffiop.h"