summaryrefslogtreecommitdiffstats
path: root/chrome/nacl/nacl_main.cc
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/nacl/nacl_main.cc
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/nacl/nacl_main.cc')
-rw-r--r--chrome/nacl/nacl_main.cc2
1 files changed, 1 insertions, 1 deletions
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)