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

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

Issue 2419723002: Move services/shell to services/service_manager (Closed)
Patch Set: rebase Created 4 years, 2 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
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 "services/shell/standalone/desktop/main_helper.h" 5 #include "services/service_manager/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 "services/shell/runner/common/switches.h" 17 #include "services/service_manager/runner/common/switches.h"
18 #include "services/shell/runner/host/child_process.h" 18 #include "services/service_manager/runner/host/child_process.h"
19 #include "services/shell/runner/init.h" 19 #include "services/service_manager/runner/init.h"
20 #include "services/shell/standalone/desktop/launcher_process.h" 20 #include "services/service_manager/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 shell { 28 namespace shell {
29 29
30 int StandaloneShellMain(int argc, char** argv) { 30 int StandaloneShellMain(int argc, char** argv) {
31 base::CommandLine::Init(argc, argv); 31 base::CommandLine::Init(argc, argv);
32 const base::CommandLine& command_line = 32 const base::CommandLine& command_line =
33 *base::CommandLine::ForCurrentProcess(); 33 *base::CommandLine::ForCurrentProcess();
34 34
35 base::AtExitManager at_exit; 35 base::AtExitManager at_exit;
36 InitializeLogging(); 36 InitializeLogging();
37 WaitForDebuggerIfNecessary(); 37 WaitForDebuggerIfNecessary();
38 38
39 #if !defined(OFFICIAL_BUILD) && defined(OS_WIN) 39 #if !defined(OFFICIAL_BUILD) && defined(OS_WIN)
40 base::RouteStdioToConsole(false); 40 base::RouteStdioToConsole(false);
41 #endif 41 #endif
42 42
43 if (command_line.HasSwitch(switches::kChildProcess)) 43 if (command_line.HasSwitch(switches::kChildProcess))
44 return ChildProcessMain(); 44 return ChildProcessMain();
45 45
46 return LauncherProcessMain(); 46 return LauncherProcessMain();
47 } 47 }
48 48
49 } // namespace shell 49 } // namespace shell
OLDNEW
« no previous file with comments | « services/service_manager/standalone/desktop/main_helper.h ('k') | services/service_manager/standalone/tracer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698