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

Side by Side Diff: services/service_manager/background/background_service_manager_main.cc

Issue 2566663004: Revert of Build services as standalone executables (Closed)
Patch Set: Created 4 years 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/catalog/reader.cc ('k') | services/service_manager/native_runner.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/service_manager/background/background_service_manager_main.h" 5 #include "services/service_manager/background/background_service_manager_main.h"
6 6
7 #include "base/at_exit.h" 7 #include "base/at_exit.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/debug/debugger.h" 9 #include "base/debug/debugger.h"
10 #include "base/process/launch.h" 10 #include "base/process/launch.h"
11 #include "services/service_manager/runner/common/switches.h" 11 #include "services/service_manager/runner/common/switches.h"
12 #include "services/service_manager/runner/host/child_process.h"
12 #include "services/service_manager/runner/init.h" 13 #include "services/service_manager/runner/init.h"
13 14
15 namespace service_manager {
16 namespace {
17
18 int RunChildProcess() {
19 base::AtExitManager at_exit;
20 InitializeLogging();
21 WaitForDebuggerIfNecessary();
22 #if !defined(OFFICIAL_BUILD) && defined(OS_WIN)
23 base::RouteStdioToConsole(false);
24 #endif
25 return ChildProcessMain();
26 }
27
28 } // namespace
29 } // namespace service_manager
30
14 int main(int argc, char** argv) { 31 int main(int argc, char** argv) {
32 base::CommandLine::Init(argc, argv);
33 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
34 switches::kChildProcess)) {
35 return service_manager::RunChildProcess();
36 }
37 // Reset CommandLine as most likely main() is going to use CommandLine too
38 // and expect to be able to initialize it.
39 base::CommandLine::Reset();
15 return MasterProcessMain(argc, argv); 40 return MasterProcessMain(argc, argv);
16 } 41 }
OLDNEW
« no previous file with comments | « services/catalog/reader.cc ('k') | services/service_manager/native_runner.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698