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/gpu | |
| 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/gpu')
| -rw-r--r-- | content/gpu/DEPS | 1 | ||||
| -rw-r--r-- | content/gpu/gpu_child_thread.cc | 2 | ||||
| -rw-r--r-- | content/gpu/gpu_child_thread.h | 2 | ||||
| -rw-r--r-- | content/gpu/gpu_main.cc | 1 | ||||
| -rw-r--r-- | content/gpu/gpu_process.h | 2 |
5 files changed, 5 insertions, 3 deletions
diff --git a/content/gpu/DEPS b/content/gpu/DEPS index b17f125..1831675 100644 --- a/content/gpu/DEPS +++ b/content/gpu/DEPS @@ -1,4 +1,5 @@ include_rules = [ + "+content/child", "+libEGL", "+libGLESv2", "+sandbox", diff --git a/content/gpu/gpu_child_thread.cc b/content/gpu/gpu_child_thread.cc index 451e31c..c563999 100644 --- a/content/gpu/gpu_child_thread.cc +++ b/content/gpu/gpu_child_thread.cc @@ -11,7 +11,7 @@ #include "base/command_line.h" #include "base/threading/worker_pool.h" #include "build/build_config.h" -#include "content/common/child_process.h" +#include "content/child/child_process.h" #include "content/common/gpu/gpu_messages.h" #include "content/gpu/gpu_watchdog_thread.h" #include "content/public/common/content_client.h" diff --git a/content/gpu/gpu_child_thread.h b/content/gpu/gpu_child_thread.h index d6b4ba3..4d40f9d 100644 --- a/content/gpu/gpu_child_thread.h +++ b/content/gpu/gpu_child_thread.h @@ -13,7 +13,7 @@ #include "base/memory/scoped_ptr.h" #include "base/time.h" #include "build/build_config.h" -#include "content/common/child_thread.h" +#include "content/child/child_thread.h" #include "content/common/gpu/gpu_channel.h" #include "content/common/gpu/gpu_channel_manager.h" #include "content/common/gpu/gpu_config.h" diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc index 2bfd51f..82626fb 100644 --- a/content/gpu/gpu_main.cc +++ b/content/gpu/gpu_main.cc @@ -15,6 +15,7 @@ #include "base/stringprintf.h" #include "base/threading/platform_thread.h" #include "build/build_config.h" +#include "content/child/child_process.h" #include "content/common/gpu/gpu_config.h" #include "content/common/sandbox_linux.h" #include "content/gpu/gpu_child_thread.h" diff --git a/content/gpu/gpu_process.h b/content/gpu/gpu_process.h index 5d59305..f4db71e 100644 --- a/content/gpu/gpu_process.h +++ b/content/gpu/gpu_process.h @@ -5,7 +5,7 @@ #ifndef CONTENT_GPU_GPU_PROCESS_H_ #define CONTENT_GPU_GPU_PROCESS_H_ -#include "content/common/child_process.h" +#include "content/child/child_process.h" namespace content { |