| 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 "mojo/runner/desktop/main_helper.h" | 5 #include "mojo/runner/desktop/main_helper.h" |
| 6 | 6 |
| 7 #include "base/at_exit.h" | 7 #include "base/at_exit.h" |
| 8 #include "base/base_switches.h" | 8 #include "base/base_switches.h" |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/debug/debugger.h" | 10 #include "base/debug/debugger.h" |
| (...skipping 21 matching lines...) Expand all Loading... |
| 32 const GURL& mojo_url, | 32 const GURL& mojo_url, |
| 33 const base::Closure& callback) { | 33 const base::Closure& callback) { |
| 34 base::CommandLine::Init(argc, argv); | 34 base::CommandLine::Init(argc, argv); |
| 35 const base::CommandLine& command_line = | 35 const base::CommandLine& command_line = |
| 36 *base::CommandLine::ForCurrentProcess(); | 36 *base::CommandLine::ForCurrentProcess(); |
| 37 | 37 |
| 38 base::AtExitManager at_exit; | 38 base::AtExitManager at_exit; |
| 39 InitializeLogging(); | 39 InitializeLogging(); |
| 40 WaitForDebuggerIfNecessary(); | 40 WaitForDebuggerIfNecessary(); |
| 41 | 41 |
| 42 #if !defined(OFFICIAL_BUILD) | 42 #if !defined(OFFICIAL_BUILD) && defined(OS_WIN) |
| 43 #if defined(OS_WIN) | |
| 44 base::RouteStdioToConsole(false); | 43 base::RouteStdioToConsole(false); |
| 45 #endif | 44 #endif |
| 46 #endif | |
| 47 | 45 |
| 48 if (command_line.HasSwitch(switches::kChildProcess)) | 46 if (command_line.HasSwitch(switches::kChildProcess)) |
| 49 return ChildProcessMain(); | 47 return ChildProcessMain(); |
| 50 | 48 |
| 51 return LauncherProcessMain(mojo_url, callback); | 49 return LauncherProcessMain(mojo_url, callback); |
| 52 } | 50 } |
| 53 | 51 |
| 54 } // namespace runner | 52 } // namespace runner |
| 55 } // namespace mojo | 53 } // namespace mojo |
| OLD | NEW |