diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-30 18:56:17 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-30 18:56:17 +0000 |
| commit | 32780605c12d45ee319574f95dc2facbb0c0dd9e (patch) | |
| tree | 6f07e6e76e16a01efc90ccd85be435c1813b3c5e /content/browser/browser_main.cc | |
| parent | 119793819e3e285d8be921c4ae9006dcc73c7fe3 (diff) | |
| download | chromium_src-32780605c12d45ee319574f95dc2facbb0c0dd9e.zip chromium_src-32780605c12d45ee319574f95dc2facbb0c0dd9e.tar.gz chromium_src-32780605c12d45ee319574f95dc2facbb0c0dd9e.tar.bz2 | |
Remove child_process.h includes from chrome (specifically WaitForDebugger). I moved the browser process usage to content. For the NaCl usage, it wasn't working anyways since it wasn't being passed to the process (and if it was, the message box wouldn't work on Windows because of sandbox). When this is needed again, we can figure out a good way of doing it.
BUG=98716
Review URL: http://codereview.chromium.org/8686014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112259 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/browser_main.cc')
| -rw-r--r-- | content/browser/browser_main.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/content/browser/browser_main.cc b/content/browser/browser_main.cc index 1127117..0efd4ae 100644 --- a/content/browser/browser_main.cc +++ b/content/browser/browser_main.cc @@ -5,12 +5,14 @@ #include "content/browser/browser_main.h" #include "base/allocator/allocator_shim.h" +#include "base/base_switches.h" #include "base/command_line.h" #include "base/debug/trace_event.h" #include "base/logging.h" #include "base/metrics/histogram.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" @@ -36,6 +38,12 @@ bool ExitedMainMessageLoop() { int BrowserMain(const content::MainFunctionParams& parameters) { TRACE_EVENT_BEGIN_ETW("BrowserMain", 0, ""); + // 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"); + NotificationServiceImpl main_notification_service; scoped_ptr<content::BrowserMainLoop> main_loop( |