Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(174)

Side by Side Diff: mojo/runner/desktop/main.cc

Issue 1440053002: Remove duplication between Mandoline and mojo_runner main functions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « mojo/runner/desktop/launcher_process.cc ('k') | mojo/runner/desktop/main_helper.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "mojo/runner/desktop/main_helper.h"
6 #include "base/command_line.h"
7 #include "base/debug/stack_trace.h"
8 #include "base/process/launch.h"
9 #include "build/build_config.h"
10 #include "mojo/runner/desktop/launcher_process.h"
11 #include "mojo/runner/host/child_process.h"
12 #include "mojo/runner/host/switches.h"
13 #include "mojo/runner/init.h"
14 6
15 int main(int argc, char** argv) { 7 int main(int argc, char** argv) {
16 base::AtExitManager at_exit; 8 return mojo::runner::RunnerMain(argc, argv, GURL(), base::Closure());
17 base::CommandLine::Init(argc, argv);
18
19 mojo::runner::InitializeLogging();
20
21 const base::CommandLine& command_line =
22 *base::CommandLine::ForCurrentProcess();
23
24 #if !defined(OFFICIAL_BUILD)
25 base::debug::EnableInProcessStackDumping();
26 #if defined(OS_WIN)
27 base::RouteStdioToConsole(false);
28 #endif
29 #endif
30
31 if (command_line.HasSwitch(switches::kChildProcess))
32 return mojo::runner::ChildProcessMain();
33
34 return mojo::runner::LauncherProcessMain(argc, argv);
35 } 9 }
OLDNEW
« no previous file with comments | « mojo/runner/desktop/launcher_process.cc ('k') | mojo/runner/desktop/main_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698