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