| 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/command_line.h" | 6 #include "base/command_line.h" |
| 7 #include "mandoline/app/desktop/launcher_process.h" | 7 #include "mandoline/app/desktop/launcher_process.h" |
| 8 #include "mojo/shell/child_process.h" | 8 #include "mojo/runner/child_process.h" |
| 9 #include "mojo/shell/init.h" | 9 #include "mojo/runner/init.h" |
| 10 #include "mojo/shell/switches.h" | 10 #include "mojo/runner/switches.h" |
| 11 | 11 |
| 12 int main(int argc, char** argv) { | 12 int main(int argc, char** argv) { |
| 13 base::AtExitManager at_exit; | 13 base::AtExitManager at_exit; |
| 14 base::CommandLine::Init(argc, argv); | 14 base::CommandLine::Init(argc, argv); |
| 15 | 15 |
| 16 mojo::shell::InitializeLogging(); | 16 mojo::shell::InitializeLogging(); |
| 17 | 17 |
| 18 const base::CommandLine& command_line = | 18 const base::CommandLine& command_line = |
| 19 *base::CommandLine::ForCurrentProcess(); | 19 *base::CommandLine::ForCurrentProcess(); |
| 20 if (command_line.HasSwitch(switches::kChildProcess)) | 20 if (command_line.HasSwitch(switches::kChildProcess)) |
| 21 return mojo::shell::ChildProcessMain(); | 21 return mojo::shell::ChildProcessMain(); |
| 22 | 22 |
| 23 return mandoline::LauncherProcessMain(argc, argv); | 23 return mandoline::LauncherProcessMain(argc, argv); |
| 24 } | 24 } |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1110823002:
Fix Mojo and Mandoline builds. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master