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/browser/browser_main_runner.cc | |
| 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/browser/browser_main_runner.cc')
| -rw-r--r-- | content/browser/browser_main_runner.cc | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/content/browser/browser_main_runner.cc b/content/browser/browser_main_runner.cc index 175b62f..7c4f549 100644 --- a/content/browser/browser_main_runner.cc +++ b/content/browser/browser_main_runner.cc @@ -13,15 +13,14 @@ #include "base/metrics/statistics_recorder.h" #include "content/browser/browser_main_loop.h" #include "content/browser/notification_service_impl.h" -#include "content/common/child_process.h" #include "content/public/common/content_switches.h" #include "content/public/common/main_function_params.h" #if defined(OS_WIN) #include "base/win/metro.h" #include "base/win/windows_version.h" -#include "ui/base/win/scoped_ole_initializer.h" #include "ui/base/ime/win/tsf_bridge.h" +#include "ui/base/win/scoped_ole_initializer.h" #endif bool g_exited_main_message_loop = false; @@ -46,14 +45,6 @@ class BrowserMainRunnerImpl : public BrowserMainRunner { TRACE_EVENT0("startup", "BrowserMainRunnerImpl::Initialize") is_initialized_ = true; -#if !defined(OS_IOS) - // ChildProcess:: is a misnomer unless you consider context. Use - // of --wait-for-debugger only makes sense when Chrome itself is a - // child process (e.g. when launched by PyAuto). - if (parameters.command_line.HasSwitch(switches::kWaitForDebugger)) - ChildProcess::WaitForDebugger("Browser"); -#endif // !defined(OS_IOS) - #if defined(OS_WIN) if (parameters.command_line.HasSwitch( switches::kEnableTextServicesFramework)) { |