| Index: mojo/runner/desktop/main.cc
|
| diff --git a/mojo/runner/desktop/main.cc b/mojo/runner/desktop/main.cc
|
| index 0815c02366cbdbe7cb8acf3e5773cd5505153882..9971326e88cec2a8130b6085e07cf42dbd93b868 100644
|
| --- a/mojo/runner/desktop/main.cc
|
| +++ b/mojo/runner/desktop/main.cc
|
| @@ -2,34 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "base/at_exit.h"
|
| -#include "base/command_line.h"
|
| -#include "base/debug/stack_trace.h"
|
| -#include "base/process/launch.h"
|
| -#include "build/build_config.h"
|
| -#include "mojo/runner/desktop/launcher_process.h"
|
| -#include "mojo/runner/host/child_process.h"
|
| -#include "mojo/runner/host/switches.h"
|
| -#include "mojo/runner/init.h"
|
| +#include "mojo/runner/desktop/main_helper.h"
|
|
|
| int main(int argc, char** argv) {
|
| - base::AtExitManager at_exit;
|
| - base::CommandLine::Init(argc, argv);
|
| -
|
| - mojo::runner::InitializeLogging();
|
| -
|
| - const base::CommandLine& command_line =
|
| - *base::CommandLine::ForCurrentProcess();
|
| -
|
| -#if !defined(OFFICIAL_BUILD)
|
| - base::debug::EnableInProcessStackDumping();
|
| -#if defined(OS_WIN)
|
| - base::RouteStdioToConsole(false);
|
| -#endif
|
| -#endif
|
| -
|
| - if (command_line.HasSwitch(switches::kChildProcess))
|
| - return mojo::runner::ChildProcessMain();
|
| -
|
| - return mojo::runner::LauncherProcessMain(argc, argv);
|
| + return mojo::runner::RunnerMain(argc, argv, GURL(), base::Closure());
|
| }
|
|
|