| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 namespace shell { | 26 namespace shell { |
| 27 | 27 |
| 28 int LauncherProcessMain(const GURL& mojo_url, const base::Closure& callback) { | 28 int LauncherProcessMain(const GURL& mojo_url, const base::Closure& callback) { |
| 29 #if !defined(OFFICIAL_BUILD) | 29 #if !defined(OFFICIAL_BUILD) |
| 30 base::debug::EnableInProcessStackDumping(); | 30 base::debug::EnableInProcessStackDumping(); |
| 31 #endif | 31 #endif |
| 32 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); | 32 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); |
| 33 if (!command_line->HasSwitch(switches::kMojoSingleProcess) && | 33 if (!command_line->HasSwitch(switches::kMojoSingleProcess) && |
| 34 !command_line->HasSwitch("gtest_list_tests")) | 34 !command_line->HasSwitch("gtest_list_tests")) |
| 35 command_line->AppendSwitch(switches::kEnableMultiprocess); | 35 command_line->AppendSwitch(switches::kEnableMultiprocess); |
| 36 command_line->AppendSwitch("use-new-edk"); | |
| 37 // http://crbug.com/546644 | 36 // http://crbug.com/546644 |
| 38 command_line->AppendSwitch(switches::kMojoNoSandbox); | 37 command_line->AppendSwitch(switches::kMojoNoSandbox); |
| 39 | 38 |
| 40 base::PlatformThread::SetName("mojo_runner"); | 39 base::PlatformThread::SetName("mojo_runner"); |
| 41 | 40 |
| 42 // We want the Context to outlive the MessageLoop so that pipes are all | 41 // We want the Context to outlive the MessageLoop so that pipes are all |
| 43 // gracefully closed / error-out before we try to shut the Context down. | 42 // gracefully closed / error-out before we try to shut the Context down. |
| 44 Context shell_context; | 43 Context shell_context; |
| 45 { | 44 { |
| 46 base::MessageLoop message_loop; | 45 base::MessageLoop message_loop; |
| (...skipping 16 matching lines...) Expand all Loading... |
| 63 | 62 |
| 64 // Must be called before |message_loop| is destroyed. | 63 // Must be called before |message_loop| is destroyed. |
| 65 shell_context.Shutdown(); | 64 shell_context.Shutdown(); |
| 66 } | 65 } |
| 67 | 66 |
| 68 return 0; | 67 return 0; |
| 69 } | 68 } |
| 70 | 69 |
| 71 } // namespace shell | 70 } // namespace shell |
| 72 } // namespace mojo | 71 } // namespace mojo |
| OLD | NEW |