mojo/runner/desktop/main.cc - Issue 1091513005: Separate mojo/shell into a runner and the application manager (shell)

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1091513005: Separate mojo/shell into a runner and the application manager (shell) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: . Created 5 years, 8 months 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/filename_util.h » ('j') | no next file with comments »

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/shell/child_process.h"	7 #include "mojo/runner/child_process.h"

8 #include "mojo/shell/desktop/launcher_process.h"	8 #include "mojo/runner/desktop/launcher_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 mojo::shell::LauncherProcessMain(argc, argv);	23 return mojo::shell::LauncherProcessMain(argc, argv);

24 }	24 }

OLD	NEW