summaryrefslogtreecommitdiffstats
path: root/chrome/plugin
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-08 05:05:28 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-08 05:05:28 +0000
commit7ef40ffe187f831fa843159744cd3365fc29ac71 (patch)
tree1d34dcc419411bccb0766d05542d21636a2ebfe6 /chrome/plugin
parente0549cec57a557495914d246cf21a95e69fe5ae1 (diff)
downloadchromium_src-7ef40ffe187f831fa843159744cd3365fc29ac71.zip
chromium_src-7ef40ffe187f831fa843159744cd3365fc29ac71.tar.gz
chromium_src-7ef40ffe187f831fa843159744cd3365fc29ac71.tar.bz2
Move ChildThread and ChildProcess to content. Also move remaining code that they depend on and which depends on them.TBR=avi
Review URL: http://codereview.chromium.org/6628071 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77249 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/plugin')
-rw-r--r--chrome/plugin/chrome_plugin_host.cc2
-rw-r--r--chrome/plugin/plugin_channel.cc2
-rw-r--r--chrome/plugin/plugin_channel_base.cc2
-rw-r--r--chrome/plugin/plugin_main.cc2
-rw-r--r--chrome/plugin/plugin_thread.cc2
-rw-r--r--chrome/plugin/plugin_thread.h2
6 files changed, 6 insertions, 6 deletions
diff --git a/chrome/plugin/chrome_plugin_host.cc b/chrome/plugin/chrome_plugin_host.cc
index c0a7582..f402f16e 100644
--- a/chrome/plugin/chrome_plugin_host.cc
+++ b/chrome/plugin/chrome_plugin_host.cc
@@ -11,7 +11,6 @@
#include "base/process_util.h"
#include "base/utf_string_conversions.h"
#include "base/string_split.h"
-#include "chrome/common/child_process.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/common/chrome_plugin_lib.h"
#include "chrome/common/chrome_plugin_util.h"
@@ -19,6 +18,7 @@
#include "chrome/common/plugin_messages.h"
#include "chrome/plugin/plugin_thread.h"
#include "chrome/plugin/webplugin_proxy.h"
+#include "content/common/child_process.h"
#include "content/common/resource_dispatcher.h"
#include "net/base/data_url.h"
#include "net/base/io_buffer.h"
diff --git a/chrome/plugin/plugin_channel.cc b/chrome/plugin/plugin_channel.cc
index ff817a7..565060b 100644
--- a/chrome/plugin/plugin_channel.cc
+++ b/chrome/plugin/plugin_channel.cc
@@ -10,12 +10,12 @@
#include "base/synchronization/lock.h"
#include "base/synchronization/waitable_event.h"
#include "build/build_config.h"
-#include "chrome/common/child_process.h"
#include "chrome/common/plugin_messages.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/plugin/plugin_thread.h"
#include "chrome/plugin/webplugin_delegate_stub.h"
#include "chrome/plugin/webplugin_proxy.h"
+#include "content/common/child_process.h"
#include "webkit/plugins/npapi/plugin_instance.h"
#if defined(OS_POSIX)
diff --git a/chrome/plugin/plugin_channel_base.cc b/chrome/plugin/plugin_channel_base.cc
index 3c43124..df09e39 100644
--- a/chrome/plugin/plugin_channel_base.cc
+++ b/chrome/plugin/plugin_channel_base.cc
@@ -10,7 +10,7 @@
#include "base/hash_tables.h"
#include "base/lazy_instance.h"
#include "base/string_number_conversions.h"
-#include "chrome/common/child_process.h"
+#include "content/common/child_process.h"
#include "ipc/ipc_sync_message.h"
#if defined(OS_POSIX)
diff --git a/chrome/plugin/plugin_main.cc b/chrome/plugin/plugin_main.cc
index d8264fe..2175b05 100644
--- a/chrome/plugin/plugin_main.cc
+++ b/chrome/plugin/plugin_main.cc
@@ -13,7 +13,6 @@
#include "base/message_loop.h"
#include "base/string_util.h"
#include "base/threading/platform_thread.h"
-#include "chrome/common/child_process.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/default_plugin.h"
@@ -21,6 +20,7 @@
#include "chrome/common/logging_chrome.h"
#include "chrome/common/main_function_params.h"
#include "chrome/plugin/plugin_thread.h"
+#include "content/common/child_process.h"
#include "ui/base/system_monitor/system_monitor.h"
#if defined(OS_WIN)
diff --git a/chrome/plugin/plugin_thread.cc b/chrome/plugin/plugin_thread.cc
index 491feb0..ad0f521 100644
--- a/chrome/plugin/plugin_thread.cc
+++ b/chrome/plugin/plugin_thread.cc
@@ -19,7 +19,6 @@
#include "base/lazy_instance.h"
#include "base/process_util.h"
#include "base/threading/thread_local.h"
-#include "chrome/common/child_process.h"
#include "chrome/common/chrome_plugin_lib.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/plugin_messages.h"
@@ -27,6 +26,7 @@
#include "chrome/plugin/chrome_plugin_host.h"
#include "chrome/plugin/npobject_util.h"
#include "chrome/renderer/render_thread.h"
+#include "content/common/child_process.h"
#include "ipc/ipc_channel_handle.h"
#include "net/base/net_errors.h"
#include "webkit/glue/webkit_glue.h"
diff --git a/chrome/plugin/plugin_thread.h b/chrome/plugin/plugin_thread.h
index f5ef267..8514589 100644
--- a/chrome/plugin/plugin_thread.h
+++ b/chrome/plugin/plugin_thread.h
@@ -9,8 +9,8 @@
#include "base/file_path.h"
#include "base/native_library.h"
#include "build/build_config.h"
-#include "chrome/common/child_thread.h"
#include "chrome/plugin/plugin_channel.h"
+#include "content/common/child_thread.h"
#include "webkit/plugins/npapi/plugin_lib.h"
#if defined(OS_POSIX)