diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-06 20:08:03 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-06 20:08:03 +0000 |
| commit | 10208eaf1c2702844601449633caeda35edd46bf (patch) | |
| tree | 1a4644a1392871bf9291fe004d615abaf2f5e0b8 /content/plugin | |
| parent | 4ebc34469806cdfc7a9a11cd8e3a7a6b4fcf86df (diff) | |
| download | chromium_src-10208eaf1c2702844601449633caeda35edd46bf.zip chromium_src-10208eaf1c2702844601449633caeda35edd46bf.tar.gz chromium_src-10208eaf1c2702844601449633caeda35edd46bf.tar.bz2 | |
Move a bunch of child-only code from content/common to content/child
Was just trying to move content/common/resource_dispatcher.{cc,h}, but that ends up needing a lot of other things to move.
TBR=jam@chromium.org
BUG=246357
Review URL: https://codereview.chromium.org/16328003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204569 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/plugin')
| -rw-r--r-- | content/plugin/plugin_channel.cc | 2 | ||||
| -rw-r--r-- | content/plugin/plugin_main.cc | 4 | ||||
| -rw-r--r-- | content/plugin/plugin_thread.cc | 2 | ||||
| -rw-r--r-- | content/plugin/plugin_thread.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/content/plugin/plugin_channel.cc b/content/plugin/plugin_channel.cc index cf20c3c..d1423b4 100644 --- a/content/plugin/plugin_channel.cc +++ b/content/plugin/plugin_channel.cc @@ -11,8 +11,8 @@ #include "base/synchronization/lock.h" #include "base/synchronization/waitable_event.h" #include "build/build_config.h" +#include "content/child/child_process.h" #include "content/child/plugin_messages.h" -#include "content/common/child_process.h" #include "content/common/plugin_process_messages.h" #include "content/plugin/plugin_thread.h" #include "content/plugin/webplugin_delegate_stub.h" diff --git a/content/plugin/plugin_main.cc b/content/plugin/plugin_main.cc index 298fbd4..8a96d8f 100644 --- a/content/plugin/plugin_main.cc +++ b/content/plugin/plugin_main.cc @@ -12,10 +12,10 @@ #include "base/command_line.h" #include "base/hi_res_timer_manager.h" #include "base/message_loop.h" -#include "base/string_util.h" #include "base/power_monitor/power_monitor.h" +#include "base/string_util.h" #include "base/threading/platform_thread.h" -#include "content/common/child_process.h" +#include "content/child/child_process.h" #include "content/plugin/plugin_thread.h" #include "content/public/common/content_switches.h" #include "content/public/common/main_function_params.h" diff --git a/content/plugin/plugin_thread.cc b/content/plugin/plugin_thread.cc index fdb46b5..3bb76af 100644 --- a/content/plugin/plugin_thread.cc +++ b/content/plugin/plugin_thread.cc @@ -20,8 +20,8 @@ #include "base/lazy_instance.h" #include "base/process_util.h" #include "base/threading/thread_local.h" +#include "content/child/child_process.h" #include "content/child/npobject_util.h" -#include "content/common/child_process.h" #include "content/common/plugin_process_messages.h" #include "content/public/common/content_switches.h" #include "content/public/plugin/content_plugin_client.h" diff --git a/content/plugin/plugin_thread.h b/content/plugin/plugin_thread.h index 86c9b2d..bf4a570 100644 --- a/content/plugin/plugin_thread.h +++ b/content/plugin/plugin_thread.h @@ -8,7 +8,7 @@ #include "base/files/file_path.h" #include "base/native_library.h" #include "build/build_config.h" -#include "content/common/child_thread.h" +#include "content/child/child_thread.h" #include "content/plugin/plugin_channel.h" #include "webkit/plugins/npapi/plugin_lib.h" |