| 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 "base/at_exit.h" | 5 #include "base/at_exit.h" |
| 6 #include "base/bind.h" |
| 6 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/files/file_path.h" |
| 7 #include "mandoline/app/desktop/launcher_process.h" | 9 #include "mandoline/app/desktop/launcher_process.h" |
| 8 #include "mojo/runner/child_process.h" | 10 #include "mojo/runner/child_process.h" |
| 9 #include "mojo/runner/init.h" | 11 #include "mojo/runner/init.h" |
| 10 #include "mojo/runner/switches.h" | 12 #include "mojo/runner/switches.h" |
| 13 #include "mojo/shell/native_runner.h" |
| 11 | 14 |
| 12 int main(int argc, char** argv) { | 15 int main(int argc, char** argv) { |
| 13 base::CommandLine::Init(argc, argv); | 16 base::CommandLine::Init(argc, argv); |
| 14 const base::CommandLine& command_line = | 17 const base::CommandLine& command_line = |
| 15 *base::CommandLine::ForCurrentProcess(); | 18 *base::CommandLine::ForCurrentProcess(); |
| 16 | 19 |
| 17 base::AtExitManager at_exit; | 20 base::AtExitManager at_exit; |
| 18 mojo::runner::InitializeLogging(); | 21 mojo::runner::InitializeLogging(); |
| 19 mojo::runner::WaitForDebuggerIfNecessary(); | 22 mojo::runner::WaitForDebuggerIfNecessary(); |
| 20 | 23 |
| 21 if (command_line.HasSwitch(switches::kChildProcess)) | 24 if (command_line.HasSwitch(switches::kChildProcess)) |
| 22 return mojo::runner::ChildProcessMain(); | 25 return mojo::runner::ChildProcessMain(); |
| 23 | 26 |
| 24 return mandoline::LauncherProcessMain(argc, argv); | 27 return mandoline::LauncherProcessMain(argc, argv); |
| 25 } | 28 } |
| OLD | NEW |