Chromium Code Reviews| 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 "base/at_exit.h" | 5 #include "base/at_exit.h" |
| 6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
| 7 #include "mojo/runner/child_process.h" | 7 #include "mojo/runner/child_process.h" |
| 8 #include "mojo/runner/desktop/launcher_process.h" | 8 #include "mojo/runner/desktop/launcher_process.h" |
| 9 #include "mojo/runner/init.h" | 9 #include "mojo/runner/init.h" |
| 10 #include "mojo/runner/scoped_user_data_dir.h" | |
| 10 #include "mojo/runner/switches.h" | 11 #include "mojo/runner/switches.h" |
| 11 | 12 |
| 12 int main(int argc, char** argv) { | 13 int main(int argc, char** argv) { |
| 13 base::AtExitManager at_exit; | 14 base::AtExitManager at_exit; |
| 14 base::CommandLine::Init(argc, argv); | 15 base::CommandLine::Init(argc, argv); |
| 15 | 16 |
| 16 mojo::runner::InitializeLogging(); | 17 mojo::runner::InitializeLogging(); |
| 17 | 18 |
| 19 mojo::runner::ScopedUserDataDir scoped_user_data_dir; | |
|
jam
2015/06/25 15:28:23
a few issues of putting it here: it's running for
| |
| 20 | |
| 18 const base::CommandLine& command_line = | 21 const base::CommandLine& command_line = |
| 19 *base::CommandLine::ForCurrentProcess(); | 22 *base::CommandLine::ForCurrentProcess(); |
| 20 if (command_line.HasSwitch(switches::kChildProcess)) | 23 if (command_line.HasSwitch(switches::kChildProcess)) |
| 21 return mojo::runner::ChildProcessMain(); | 24 return mojo::runner::ChildProcessMain(); |
| 22 | 25 |
| 23 return mojo::runner::LauncherProcessMain(argc, argv); | 26 return mojo::runner::LauncherProcessMain(argc, argv); |
| 24 } | 27 } |
| OLD | NEW |