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

Side by Side Diff: services/shell/standalone/desktop/main_helper.cc

Issue 1877753003: Move mojo\shell to services\shell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@62scan
Patch Set: . Created 4 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 | « services/shell/standalone/desktop/main_helper.h ('k') | services/shell/standalone/tracer.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 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 "mojo/shell/standalone/desktop/main_helper.h" 5 #include "services/shell/standalone/desktop/main_helper.h"
6 6
7 #include "base/at_exit.h" 7 #include "base/at_exit.h"
8 #include "base/base_switches.h" 8 #include "base/base_switches.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/debug/debugger.h" 10 #include "base/debug/debugger.h"
11 #include "base/files/file_path.h" 11 #include "base/files/file_path.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/process/launch.h" 13 #include "base/process/launch.h"
14 #include "base/stl_util.h" 14 #include "base/stl_util.h"
15 #include "base/strings/string_split.h" 15 #include "base/strings/string_split.h"
16 #include "base/strings/utf_string_conversions.h" 16 #include "base/strings/utf_string_conversions.h"
17 #include "mojo/shell/runner/common/switches.h" 17 #include "services/shell/runner/common/switches.h"
18 #include "mojo/shell/runner/host/child_process.h" 18 #include "services/shell/runner/host/child_process.h"
19 #include "mojo/shell/runner/init.h" 19 #include "services/shell/runner/init.h"
20 #include "mojo/shell/standalone/desktop/launcher_process.h" 20 #include "services/shell/standalone/desktop/launcher_process.h"
21 21
22 #if defined(OS_WIN) 22 #if defined(OS_WIN)
23 #include <windows.h> 23 #include <windows.h>
24 #elif (OS_POSIX) 24 #elif (OS_POSIX)
25 #include <unistd.h> 25 #include <unistd.h>
26 #endif 26 #endif
27 27
28 namespace mojo { 28 namespace mojo {
29 namespace shell { 29 namespace shell {
30 30
(...skipping 11 matching lines...) Expand all
42 #endif 42 #endif
43 43
44 if (command_line.HasSwitch(switches::kChildProcess)) 44 if (command_line.HasSwitch(switches::kChildProcess))
45 return ChildProcessMain(); 45 return ChildProcessMain();
46 46
47 return LauncherProcessMain(); 47 return LauncherProcessMain();
48 } 48 }
49 49
50 } // namespace shell 50 } // namespace shell
51 } // namespace mojo 51 } // namespace mojo
OLDNEW
« no previous file with comments | « services/shell/standalone/desktop/main_helper.h ('k') | services/shell/standalone/tracer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698