diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-08 05:05:28 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-08 05:05:28 +0000 |
| commit | 7ef40ffe187f831fa843159744cd3365fc29ac71 (patch) | |
| tree | 1d34dcc419411bccb0766d05542d21636a2ebfe6 /chrome/nacl | |
| parent | e0549cec57a557495914d246cf21a95e69fe5ae1 (diff) | |
| download | chromium_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/nacl')
| -rw-r--r-- | chrome/nacl/broker_thread.cc | 2 | ||||
| -rw-r--r-- | chrome/nacl/broker_thread.h | 2 | ||||
| -rw-r--r-- | chrome/nacl/nacl_main.cc | 2 | ||||
| -rw-r--r-- | chrome/nacl/nacl_thread.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/chrome/nacl/broker_thread.cc b/chrome/nacl/broker_thread.cc index 984acb3..d069a13 100644 --- a/chrome/nacl/broker_thread.cc +++ b/chrome/nacl/broker_thread.cc @@ -8,11 +8,11 @@ #include "base/command_line.h" #include "base/path_service.h" #include "base/process_util.h" -#include "chrome/common/child_process.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/nacl_cmd_line.h" #include "chrome/common/nacl_messages.h" #include "chrome/common/sandbox_policy.h" +#include "content/common/child_process.h" #include "ipc/ipc_switches.h" NaClBrokerThread::NaClBrokerThread() diff --git a/chrome/nacl/broker_thread.h b/chrome/nacl/broker_thread.h index 8b2d7c5..3c1e3ac 100644 --- a/chrome/nacl/broker_thread.h +++ b/chrome/nacl/broker_thread.h @@ -7,8 +7,8 @@ #pragma once #include "base/process.h" -#include "chrome/common/child_thread.h" #include "chrome/common/nacl_types.h" +#include "content/common/child_thread.h" #if defined(OS_WIN) #include "sandbox/src/sandbox.h" diff --git a/chrome/nacl/nacl_main.cc b/chrome/nacl/nacl_main.cc index cb7fe26..c4ebd89 100644 --- a/chrome/nacl/nacl_main.cc +++ b/chrome/nacl/nacl_main.cc @@ -16,7 +16,6 @@ #include "chrome/app/breakpad_linux.h" #endif -#include "chrome/common/child_process.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/hi_res_timer_manager.h" @@ -26,6 +25,7 @@ #include "chrome/common/sandbox_policy.h" #include "chrome/nacl/nacl_main_platform_delegate.h" #include "chrome/nacl/nacl_thread.h" +#include "content/common/child_process.h" #include "ui/base/system_monitor/system_monitor.h" #if defined(OS_WIN) diff --git a/chrome/nacl/nacl_thread.h b/chrome/nacl/nacl_thread.h index b330794..bf9645a 100644 --- a/chrome/nacl/nacl_thread.h +++ b/chrome/nacl/nacl_thread.h @@ -7,8 +7,8 @@ #pragma once #include "base/native_library.h" -#include "chrome/common/child_thread.h" #include "chrome/common/nacl_types.h" +#include "content/common/child_thread.h" // The NaClThread class represents a background thread where NaCl app gets // started. |