diff options
| author | jam <jam@chromium.org> | 2015-11-02 08:06:02 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-02 16:06:48 +0000 |
| commit | 8627a07c4dcdd84246b419b2f9659be8dc5c4ffd (patch) | |
| tree | 64c53dd4305962e66ab313e18051eec6649753e7 /mandoline/app | |
| parent | b50320c34a321b280abf95ea361ce2c74d9137ba (diff) | |
| download | chromium_src-8627a07c4dcdd84246b419b2f9659be8dc5c4ffd.zip chromium_src-8627a07c4dcdd84246b419b2f9659be8dc5c4ffd.tar.gz chromium_src-8627a07c4dcdd84246b419b2f9659be8dc5c4ffd.tar.bz2 | |
Enable multiprocess by default on desktop Mandoline.
This also turns on the new EDK by default (we see hangs with the old one) and disables the sandbox while a recent regression is tracked down.
BUG=478251,546644
Review URL: https://codereview.chromium.org/1406403004
Cr-Commit-Position: refs/heads/master@{#357360}
Diffstat (limited to 'mandoline/app')
| -rw-r--r-- | mandoline/app/desktop/BUILD.gn | 1 | ||||
| -rw-r--r-- | mandoline/app/desktop/launcher_process.cc | 14 |
2 files changed, 10 insertions, 5 deletions
diff --git a/mandoline/app/desktop/BUILD.gn b/mandoline/app/desktop/BUILD.gn index d72fb60..9a6723c 100644 --- a/mandoline/app/desktop/BUILD.gn +++ b/mandoline/app/desktop/BUILD.gn @@ -25,6 +25,7 @@ executable("mandoline") { "//mojo/package_manager", "//mojo/runner:lib", "//mojo/runner:register_local_aliases_fwd", + "//mojo/shell", ] data_deps = [ diff --git a/mandoline/app/desktop/launcher_process.cc b/mandoline/app/desktop/launcher_process.cc index 5e21090..252a27b 100644 --- a/mandoline/app/desktop/launcher_process.cc +++ b/mandoline/app/desktop/launcher_process.cc @@ -22,19 +22,23 @@ #include "mojo/runner/context.h" #include "mojo/runner/switches.h" #include "mojo/runner/tracer.h" +#include "mojo/shell/switches.h" namespace mandoline { int LauncherProcessMain(int argc, char** argv) { mojo::runner::Tracer tracer; - const base::CommandLine& command_line = - *base::CommandLine::ForCurrentProcess(); + base::CommandLine* command_line = + base::CommandLine::ForCurrentProcess(); + command_line->AppendSwitch("use-new-edk"); + // http://crbug.com/546644 + command_line->AppendSwitch(switches::kMojoNoSandbox); - bool trace_startup = command_line.HasSwitch(switches::kTraceStartup); + bool trace_startup = command_line->HasSwitch(switches::kTraceStartup); if (trace_startup) { tracer.Start( - command_line.GetSwitchValueASCII(switches::kTraceStartup), - command_line.GetSwitchValueASCII(switches::kTraceStartupDuration), + command_line->GetSwitchValueASCII(switches::kTraceStartup), + command_line->GetSwitchValueASCII(switches::kTraceStartupDuration), "mandoline.trace"); } |