diff options
| author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-06 22:20:28 +0000 |
|---|---|---|
| committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-06 22:20:28 +0000 |
| commit | b697e1a4be99f6509b2a4b1ca314608d3416a50d (patch) | |
| tree | 7f55688621d81a6fc612c0c9d56b8dd7eaec35c6 /ppapi/proxy | |
| parent | e72e55b2c02e69a0b7b095f455a7cfedaa1d91c2 (diff) | |
| download | chromium_src-b697e1a4be99f6509b2a4b1ca314608d3416a50d.zip chromium_src-b697e1a4be99f6509b2a4b1ca314608d3416a50d.tar.gz chromium_src-b697e1a4be99f6509b2a4b1ca314608d3416a50d.tar.bz2 | |
Move ppb_flash.h to ppapi/c/private ...
... from webkit/plugins/ppapi.
BUG=none
TEST=builds
Review URL: http://codereview.chromium.org/6141001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70668 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy')
| -rw-r--r-- | ppapi/proxy/DEPS | 1 | ||||
| -rw-r--r-- | ppapi/proxy/dispatcher.cc | 4 | ||||
| -rw-r--r-- | ppapi/proxy/ppb_flash_proxy.cc | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/ppapi/proxy/DEPS b/ppapi/proxy/DEPS index fd6f58c..b031405 100644 --- a/ppapi/proxy/DEPS +++ b/ppapi/proxy/DEPS @@ -6,7 +6,6 @@ include_rules = [ # 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", - "+webkit/plugins/ppapi/ppb_flash.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 diff --git a/ppapi/proxy/dispatcher.cc b/ppapi/proxy/dispatcher.cc index e6637db1..2412a54 100644 --- a/ppapi/proxy/dispatcher.cc +++ b/ppapi/proxy/dispatcher.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. @@ -32,6 +32,7 @@ #include "ppapi/c/ppb_url_request_info.h" #include "ppapi/c/ppb_url_response_info.h" #include "ppapi/c/ppp_instance.h" +#include "ppapi/c/private/ppb_flash.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_instance_proxy.h" #include "ppapi/proxy/var_serialization_rules.h" #include "webkit/plugins/ppapi/ppb_pdf.h" -#include "webkit/plugins/ppapi/ppb_flash.h" namespace pp { namespace proxy { diff --git a/ppapi/proxy/ppb_flash_proxy.cc b/ppapi/proxy/ppb_flash_proxy.cc index 13fe1d0..2599f94 100644 --- a/ppapi/proxy/ppb_flash_proxy.cc +++ b/ppapi/proxy/ppb_flash_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,11 +11,11 @@ #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/pp_resource.h" +#include "ppapi/c/private/ppb_flash.h" #include "ppapi/proxy/plugin_dispatcher.h" #include "ppapi/proxy/plugin_resource.h" #include "ppapi/proxy/ppapi_messages.h" #include "ppapi/proxy/serialized_var.h" -#include "webkit/plugins/ppapi/ppb_flash.h" namespace pp { namespace proxy { |