Index: shell/context.cc |
diff --git a/shell/context.cc b/shell/context.cc |
index d3a86132b5eea47a4d66fa25aa02a6d1e8cd091d..5f776e3fa1f8dcda6c962c85821885a0c6ca82da 100644 |
--- a/shell/context.cc |
+++ b/shell/context.cc |
@@ -6,6 +6,7 @@ |
#include <vector> |
+#include "base/base_switches.h" |
#include "base/bind.h" |
#include "base/command_line.h" |
#include "base/files/file_path.h" |
@@ -136,6 +137,11 @@ void Context::EnsureEmbedderIsInitialized() { |
} |
bool Context::Init() { |
+ base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); |
+ |
+ if (command_line->HasSwitch(switches::kWaitForDebugger)) |
+ base::debug::WaitForDebugger(60, true); |
+ |
EnsureEmbedderIsInitialized(); |
task_runners_.reset( |
new TaskRunners(base::MessageLoop::current()->message_loop_proxy())); |
@@ -143,8 +149,6 @@ bool Context::Init() { |
for (size_t i = 0; i < arraysize(kLocalMojoURLs); ++i) |
mojo_url_resolver_.AddLocalFileMapping(GURL(kLocalMojoURLs[i])); |
- base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); |
- |
if (command_line->HasSwitch(switches::kEnableExternalApplications)) { |
listener_ = ExternalApplicationListener::Create( |
task_runners_->shell_runner(), task_runners_->io_runner()); |