summaryrefslogtreecommitdiffstats
path: root/ppapi/proxy
diff options
context:
space:
mode:
authorviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-13 17:07:29 +0000
committerviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-13 17:07:29 +0000
commit917a44b0724089630cb1d962a9383df7a1deaf7e (patch)
tree14300a03e7d0a32b81f7f6b668c5dbd2d13da9c3 /ppapi/proxy
parent475478894062d23834cd660f4bba6eaf385e958d (diff)
downloadchromium_src-917a44b0724089630cb1d962a9383df7a1deaf7e.zip
chromium_src-917a44b0724089630cb1d962a9383df7a1deaf7e.tar.gz
chromium_src-917a44b0724089630cb1d962a9383df7a1deaf7e.tar.bz2
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
Diffstat (limited to 'ppapi/proxy')
-rw-r--r--ppapi/proxy/DEPS5
-rw-r--r--ppapi/proxy/dispatcher.cc2
-rw-r--r--ppapi/proxy/ppb_pdf_proxy.cc4
3 files changed, 3 insertions, 8 deletions
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 {