| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <stdio.h> | 5 #include <stdio.h> |
| 6 #include <string.h> | 6 #include <string.h> |
| 7 | 7 |
| 8 #include <algorithm> | 8 #include <algorithm> |
| 9 #include <iostream> | 9 #include <iostream> |
| 10 | 10 |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 | 26 |
| 27 namespace mandoline { | 27 namespace mandoline { |
| 28 | 28 |
| 29 int LauncherProcessMain(int argc, char** argv) { | 29 int LauncherProcessMain(int argc, char** argv) { |
| 30 mojo::runner::Tracer tracer; | 30 mojo::runner::Tracer tracer; |
| 31 base::CommandLine* command_line = | 31 base::CommandLine* command_line = |
| 32 base::CommandLine::ForCurrentProcess(); | 32 base::CommandLine::ForCurrentProcess(); |
| 33 if (!command_line->HasSwitch(switches::kMojoSingleProcess)) | 33 if (!command_line->HasSwitch(switches::kMojoSingleProcess)) |
| 34 command_line->AppendSwitch(switches::kEnableMultiprocess); | 34 command_line->AppendSwitch(switches::kEnableMultiprocess); |
| 35 command_line->AppendSwitch("use-new-edk"); | 35 command_line->AppendSwitch("use-new-edk"); |
| 36 // http://crbug.com/546644 | |
| 37 command_line->AppendSwitch(switches::kMojoNoSandbox); | |
| 38 | 36 |
| 39 bool trace_startup = command_line->HasSwitch(switches::kTraceStartup); | 37 bool trace_startup = command_line->HasSwitch(switches::kTraceStartup); |
| 40 if (trace_startup) { | 38 if (trace_startup) { |
| 41 tracer.Start( | 39 tracer.Start( |
| 42 command_line->GetSwitchValueASCII(switches::kTraceStartup), | 40 command_line->GetSwitchValueASCII(switches::kTraceStartup), |
| 43 command_line->GetSwitchValueASCII(switches::kTraceStartupDuration), | 41 command_line->GetSwitchValueASCII(switches::kTraceStartupDuration), |
| 44 "mandoline.trace"); | 42 "mandoline.trace"); |
| 45 } | 43 } |
| 46 | 44 |
| 47 // We want the runner::Context to outlive the MessageLoop so that pipes are | 45 // We want the runner::Context to outlive the MessageLoop so that pipes are |
| (...skipping 15 matching lines...) Expand all Loading... |
| 63 message_loop.Run(); | 61 message_loop.Run(); |
| 64 | 62 |
| 65 // Must be called before |message_loop| is destroyed. | 63 // Must be called before |message_loop| is destroyed. |
| 66 shell_context.Shutdown(); | 64 shell_context.Shutdown(); |
| 67 } | 65 } |
| 68 | 66 |
| 69 return 0; | 67 return 0; |
| 70 } | 68 } |
| 71 | 69 |
| 72 } // namespace mandoline | 70 } // namespace mandoline |
| OLD | NEW |