summaryrefslogtreecommitdiffstats
path: root/content/plugin
diff options
context:
space:
mode:
authorjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-18 23:35:38 +0000
committerjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-18 23:35:38 +0000
commit5d1fa247ae57b8bba67dcc28a12e83dcad9b5d10 (patch)
treef49a36b0449995b1bb2b0c0ecd0d69a0b88b1070 /content/plugin
parent8e7c3fc2ad2f9cccaee796011769b358625fb46b (diff)
downloadchromium_src-5d1fa247ae57b8bba67dcc28a12e83dcad9b5d10.zip
chromium_src-5d1fa247ae57b8bba67dcc28a12e83dcad9b5d10.tar.gz
chromium_src-5d1fa247ae57b8bba67dcc28a12e83dcad9b5d10.tar.bz2
Move content_client.h into content/public.
TBR=jam@chromium.org BUG=98716 TEST=it builds Review URL: http://codereview.chromium.org/8336007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106167 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/plugin')
-rw-r--r--content/plugin/webplugin_delegate_stub.cc2
-rw-r--r--content/plugin/webplugin_proxy.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/content/plugin/webplugin_delegate_stub.cc b/content/plugin/webplugin_delegate_stub.cc
index acf6b53..1f98e50 100644
--- a/content/plugin/webplugin_delegate_stub.cc
+++ b/content/plugin/webplugin_delegate_stub.cc
@@ -8,13 +8,13 @@
#include "base/command_line.h"
#include "base/string_number_conversions.h"
-#include "content/common/content_client.h"
#include "content/common/content_constants.h"
#include "content/common/npobject_stub.h"
#include "content/common/plugin_messages.h"
#include "content/plugin/plugin_channel.h"
#include "content/plugin/plugin_thread.h"
#include "content/plugin/webplugin_proxy.h"
+#include "content/public/common/content_client.h"
#include "content/public/common/content_switches.h"
#include "third_party/npapi/bindings/npapi.h"
#include "third_party/npapi/bindings/npruntime.h"
diff --git a/content/plugin/webplugin_proxy.cc b/content/plugin/webplugin_proxy.cc
index 42dd084..757e41e 100644
--- a/content/plugin/webplugin_proxy.cc
+++ b/content/plugin/webplugin_proxy.cc
@@ -10,12 +10,12 @@
#include "base/memory/scoped_handle.h"
#include "base/shared_memory.h"
#include "build/build_config.h"
-#include "content/common/content_client.h"
#include "content/common/npobject_proxy.h"
#include "content/common/npobject_util.h"
#include "content/common/plugin_messages.h"
#include "content/plugin/plugin_channel.h"
#include "content/plugin/plugin_thread.h"
+#include "content/public/common/content_client.h"
#include "content/public/common/url_constants.h"
#include "skia/ext/platform_canvas.h"
#include "skia/ext/platform_device.h"