Move webkit/plugins/ppapi/ppb_pdf.h to ppapi/c/private.

BUG=none
TEST=builds
Review URL: http://codereview.chromium.org/6255001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71328 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 11 insertions, 16 deletions

diff --git a/webkit/plugins/ppapi/ppb_pdf.h b/ppapi/c/private/ppb_pdf.h
index 38d1763..8a03525 100644
--- a/webkit/plugins/ppapi/ppb_pdf.h
+++ b/ppapi/c/private/ppb_pdf.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_GLUE_PLUGINS_PPB_PRIVATE_H_
-#define WEBKIT_GLUE_PLUGINS_PPB_PRIVATE_H_
+#ifndef PPAPI_C_PRIVATE_PPB_PDF_H_
+#define PPAPI_C_PRIVATE_PPB_PDF_H_
 
 #include "ppapi/c/dev/ppb_font_dev.h"
 #include "ppapi/c/pp_instance.h"
@@ -132,4 +132,4 @@ struct PPB_PDF {
   void (*UserMetricsRecordAction)(PP_Var action);
 };
 
-#endif  // WEBKIT_GLUE_PLUGINS_PPB_PRIVATE_H_
+#endif  // PPAPI_C_PRIVATE_PPB_PDF_H_
diff --git a/ppapi/ppapi.gyp b/ppapi/ppapi.gyp
index 4af3e9c..2debb57 100644
--- a/ppapi/ppapi.gyp
+++ b/ppapi/ppapi.gyp
@@ -106,6 +106,7 @@
         # Private interfaces.
         'c/private/ppb_flash.h',
         'c/private/ppb_nacl_private.h',
+        'c/private/ppb_pdf.h',
 
         # Deprecated interfaces.
         'c/dev/deprecated_bool.h',
diff --git a/ppapi/proxy/DEPS b/ppapi/proxy/DEPS
index b031405..af862c1 100644
--- a/ppapi/proxy/DEPS
+++ b/ppapi/proxy/DEPS
@@ -2,11 +2,6 @@ include_rules = [
   "+base",
   "+ipc",
 
-  # These files are really Chrome-only and we don't want to expose them, but
-  # we need to use them for the proxy. Allow the code here to pull these
-  # headers (which don't depend on anything else).
-  "+webkit/plugins/ppapi/ppb_pdf.h",
-
   # We don't want the proxy to depend on the C++ layer, which is appropriate
   # for plugins only. However, the completion callback factory is a very useful
   # tool that we would otherwise have to duplicate, and has no other
diff --git a/ppapi/proxy/dispatcher.cc b/ppapi/proxy/dispatcher.cc
index 2412a54..d984222 100644
--- a/ppapi/proxy/dispatcher.cc
+++ b/ppapi/proxy/dispatcher.cc
@@ -33,6 +33,7 @@
 #include "ppapi/c/ppb_url_response_info.h"
 #include "ppapi/c/ppp_instance.h"
 #include "ppapi/c/private/ppb_flash.h"
+#include "ppapi/c/private/ppb_pdf.h"
 #include "ppapi/c/trusted/ppb_url_loader_trusted.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/proxy/ppb_audio_config_proxy.h"
@@ -56,7 +57,6 @@
 #include "ppapi/proxy/ppp_class_proxy.h"
 #include "ppapi/proxy/ppp_instance_proxy.h"
 #include "ppapi/proxy/var_serialization_rules.h"
-#include "webkit/plugins/ppapi/ppb_pdf.h"
 
 namespace pp {
 namespace proxy {
diff --git a/ppapi/proxy/ppb_pdf_proxy.cc b/ppapi/proxy/ppb_pdf_proxy.cc
index cbd1f31..ddc404c 100644
--- a/ppapi/proxy/ppb_pdf_proxy.cc
+++ b/ppapi/proxy/ppb_pdf_proxy.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -11,10 +11,10 @@
 #include "base/linked_ptr.h"
 #include "base/logging.h"
 #include "build/build_config.h"
+#include "ppapi/c/private/ppb_pdf.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
 #include "ppapi/proxy/plugin_resource.h"
 #include "ppapi/proxy/ppapi_messages.h"
-#include "webkit/plugins/ppapi/ppb_pdf.h"
 
 namespace pp {
 namespace proxy {
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index e64f667..ceef497 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -302,7 +302,6 @@
         '../plugins/ppapi/ppb_nacl_private_impl.h',
         '../plugins/ppapi/ppb_opengles_impl.cc',
         '../plugins/ppapi/ppb_opengles_impl.h',
-        '../plugins/ppapi/ppb_pdf.h',
         '../plugins/ppapi/ppb_pdf_impl.cc',
         '../plugins/ppapi/ppb_pdf_impl.h',
         '../plugins/ppapi/ppb_scrollbar_impl.cc',
diff --git a/webkit/plugins/ppapi/plugin_module.cc b/webkit/plugins/ppapi/plugin_module.cc
index 2f9781d..8afea13 100644
--- a/webkit/plugins/ppapi/plugin_module.cc
+++ b/webkit/plugins/ppapi/plugin_module.cc
@@ -49,6 +49,7 @@
 #include "ppapi/c/ppp.h"
 #include "ppapi/c/ppp_instance.h"
 #include "ppapi/c/private/ppb_flash.h"
+#include "ppapi/c/private/ppb_pdf.h"
 #include "ppapi/c/private/ppb_nacl_private.h"
 #include "ppapi/c/trusted/ppb_image_data_trusted.h"
 #include "ppapi/c/trusted/ppb_url_loader_trusted.h"
@@ -70,7 +71,6 @@
 #include "webkit/plugins/ppapi/ppb_graphics_2d_impl.h"
 #include "webkit/plugins/ppapi/ppb_image_data_impl.h"
 #include "webkit/plugins/ppapi/ppb_nacl_private_impl.h"
-#include "webkit/plugins/ppapi/ppb_pdf.h"
 #include "webkit/plugins/ppapi/ppb_pdf_impl.h"
 #include "webkit/plugins/ppapi/ppb_scrollbar_impl.h"
 #include "webkit/plugins/ppapi/ppb_transport_impl.h"
diff --git a/webkit/plugins/ppapi/ppb_pdf_impl.cc b/webkit/plugins/ppapi/ppb_pdf_impl.cc
index 6bcfc08..ee58aef 100644
--- a/webkit/plugins/ppapi/ppb_pdf_impl.cc
+++ b/webkit/plugins/ppapi/ppb_pdf_impl.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -12,6 +12,7 @@
 #include "grit/webkit_strings.h"
 #include "skia/ext/platform_canvas.h"
 #include "ppapi/c/pp_resource.h"
+#include "ppapi/c/private/ppb_pdf.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "unicode/usearch.h"
 #include "webkit/glue/webkit_glue.h"
@@ -19,7 +20,6 @@
 #include "webkit/plugins/ppapi/plugin_module.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 #include "webkit/plugins/ppapi/ppb_image_data_impl.h"
-#include "webkit/plugins/ppapi/ppb_pdf.h"
 #include "webkit/plugins/ppapi/var.h"
 
 namespace webkit {