summaryrefslogtreecommitdiffstats
path: root/content/browser/browser_main_runner.cc
diff options
context:
space:
mode:
authormkosiba@chromium.org <mkosiba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-17 20:01:30 +0000
committermkosiba@chromium.org <mkosiba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-17 20:01:30 +0000
commit7951bca41eade4f40b78672318a62a18aac843ec (patch)
tree7ad901061cd0f3c69530752712e3817e0b635848 /content/browser/browser_main_runner.cc
parent5c72e46e3e43da13c97bdae4041a0003e23a4d21 (diff)
downloadchromium_src-7951bca41eade4f40b78672318a62a18aac843ec.zip
chromium_src-7951bca41eade4f40b78672318a62a18aac843ec.tar.gz
chromium_src-7951bca41eade4f40b78672318a62a18aac843ec.tar.bz2
Fix --wait-for-debugger.
The shared --wait-for-debugger check was removed in r204569, this adds the check back. BUG=None R=scottmg@chromium.org Review URL: https://chromiumcodereview.appspot.com/17031007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206781 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/browser_main_runner.cc')
-rw-r--r--content/browser/browser_main_runner.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/content/browser/browser_main_runner.cc b/content/browser/browser_main_runner.cc
index 9198d29..f50832a 100644
--- a/content/browser/browser_main_runner.cc
+++ b/content/browser/browser_main_runner.cc
@@ -45,6 +45,11 @@ class BrowserMainRunnerImpl : public BrowserMainRunner {
TRACE_EVENT0("startup", "BrowserMainRunnerImpl::Initialize")
is_initialized_ = true;
+#if !defined(OS_IOS)
+ if (parameters.command_line.HasSwitch(switches::kWaitForDebugger))
+ base::debug::WaitForDebugger(60, true);
+#endif
+
#if defined(OS_WIN)
if (parameters.command_line.HasSwitch(
switches::kEnableTextServicesFramework)) {