| 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/shell/standalone/desktop/main_helper.h" | 5 #include "mojo/shell/standalone/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 10 matching lines...) Expand all Loading... |
| 21 | 21 |
| 22 #if defined(OS_WIN) | 22 #if defined(OS_WIN) |
| 23 #include <windows.h> | 23 #include <windows.h> |
| 24 #elif (OS_POSIX) | 24 #elif (OS_POSIX) |
| 25 #include <unistd.h> | 25 #include <unistd.h> |
| 26 #endif | 26 #endif |
| 27 | 27 |
| 28 namespace mojo { | 28 namespace mojo { |
| 29 namespace shell { | 29 namespace shell { |
| 30 | 30 |
| 31 int StandaloneShellMain(int argc, | 31 int StandaloneShellMain(int argc, char** argv) { |
| 32 char** argv, | |
| 33 const GURL& mojo_url, | |
| 34 const base::Closure& callback) { | |
| 35 base::CommandLine::Init(argc, argv); | 32 base::CommandLine::Init(argc, argv); |
| 36 const base::CommandLine& command_line = | 33 const base::CommandLine& command_line = |
| 37 *base::CommandLine::ForCurrentProcess(); | 34 *base::CommandLine::ForCurrentProcess(); |
| 38 | 35 |
| 39 base::AtExitManager at_exit; | 36 base::AtExitManager at_exit; |
| 40 InitializeLogging(); | 37 InitializeLogging(); |
| 41 WaitForDebuggerIfNecessary(); | 38 WaitForDebuggerIfNecessary(); |
| 42 | 39 |
| 43 #if !defined(OFFICIAL_BUILD) && defined(OS_WIN) | 40 #if !defined(OFFICIAL_BUILD) && defined(OS_WIN) |
| 44 base::RouteStdioToConsole(false); | 41 base::RouteStdioToConsole(false); |
| 45 #endif | 42 #endif |
| 46 | 43 |
| 47 if (command_line.HasSwitch(switches::kChildProcess)) | 44 if (command_line.HasSwitch(switches::kChildProcess)) |
| 48 return ChildProcessMain(); | 45 return ChildProcessMain(); |
| 49 | 46 |
| 50 return LauncherProcessMain(mojo_url, callback); | 47 return LauncherProcessMain(); |
| 51 } | 48 } |
| 52 | 49 |
| 53 } // namespace shell | 50 } // namespace shell |
| 54 } // namespace mojo | 51 } // namespace mojo |
| OLD | NEW |