summaryrefslogtreecommitdiffstats
path: root/content/plugin
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-13 22:20:29 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-13 22:20:29 +0000
commitc08950d205ff5366e6e26059cd6568cb89b28c90 (patch)
tree51640a82f1d019b619df2bbe55b612ef2d66094e /content/plugin
parentaea9fa18d6b83fa89042d9b16d70a9d1ade82d75 (diff)
downloadchromium_src-c08950d205ff5366e6e26059cd6568cb89b28c90.zip
chromium_src-c08950d205ff5366e6e26059cd6568cb89b28c90.tar.gz
chromium_src-c08950d205ff5366e6e26059cd6568cb89b28c90.tar.bz2
Move content_switches to content\public\common.
BUG=98716 Review URL: http://codereview.chromium.org/8277018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105389 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/plugin')
-rw-r--r--content/plugin/plugin_channel.cc2
-rw-r--r--content/plugin/plugin_main.cc2
-rw-r--r--content/plugin/plugin_thread.cc2
-rw-r--r--content/plugin/webplugin_delegate_stub.cc2
4 files changed, 4 insertions, 4 deletions
diff --git a/content/plugin/plugin_channel.cc b/content/plugin/plugin_channel.cc
index a9a12a6..faf0a63 100644
--- a/content/plugin/plugin_channel.cc
+++ b/content/plugin/plugin_channel.cc
@@ -11,8 +11,8 @@
#include "base/synchronization/waitable_event.h"
#include "build/build_config.h"
#include "content/common/child_process.h"
-#include "content/common/content_switches.h"
#include "content/common/plugin_messages.h"
+#include "content/public/common/content_switches.h"
#include "content/plugin/plugin_thread.h"
#include "content/plugin/webplugin_delegate_stub.h"
#include "content/plugin/webplugin_proxy.h"
diff --git a/content/plugin/plugin_main.cc b/content/plugin/plugin_main.cc
index 63d5d68..1f927459 100644
--- a/content/plugin/plugin_main.cc
+++ b/content/plugin/plugin_main.cc
@@ -15,10 +15,10 @@
#include "base/system_monitor/system_monitor.h"
#include "base/threading/platform_thread.h"
#include "content/common/child_process.h"
-#include "content/common/content_switches.h"
#include "content/common/hi_res_timer_manager.h"
#include "content/common/main_function_params.h"
#include "content/plugin/plugin_thread.h"
+#include "content/public/common/content_switches.h"
#if defined(OS_WIN)
#include "content/common/injection_test_dll.h"
diff --git a/content/plugin/plugin_thread.cc b/content/plugin/plugin_thread.cc
index 89c8307..195bffe 100644
--- a/content/plugin/plugin_thread.cc
+++ b/content/plugin/plugin_thread.cc
@@ -20,9 +20,9 @@
#include "base/process_util.h"
#include "base/threading/thread_local.h"
#include "content/common/child_process.h"
-#include "content/common/content_switches.h"
#include "content/common/npobject_util.h"
#include "content/common/plugin_messages.h"
+#include "content/public/common/content_switches.h"
#include "content/public/plugin/content_plugin_client.h"
#include "ipc/ipc_channel_handle.h"
#include "webkit/glue/webkit_glue.h"
diff --git a/content/plugin/webplugin_delegate_stub.cc b/content/plugin/webplugin_delegate_stub.cc
index 73d28b2..acf6b53 100644
--- a/content/plugin/webplugin_delegate_stub.cc
+++ b/content/plugin/webplugin_delegate_stub.cc
@@ -10,12 +10,12 @@
#include "base/string_number_conversions.h"
#include "content/common/content_client.h"
#include "content/common/content_constants.h"
-#include "content/common/content_switches.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_switches.h"
#include "third_party/npapi/bindings/npapi.h"
#include "third_party/npapi/bindings/npruntime.h"
#include "skia/ext/platform_device.h"