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

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

Issue 2427443002: Replace remaining shell references with service manager (Closed)
Patch Set: 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 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_shell_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/host/child_process.h"
13 #include "services/service_manager/runner/init.h" 13 #include "services/service_manager/runner/init.h"
14 14
15 namespace service_manager { 15 namespace service_manager {
(...skipping 16 matching lines...) Expand all
32 base::CommandLine::Init(argc, argv); 32 base::CommandLine::Init(argc, argv);
33 if (base::CommandLine::ForCurrentProcess()->HasSwitch( 33 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
34 switches::kChildProcess)) { 34 switches::kChildProcess)) {
35 return service_manager::RunChildProcess(); 35 return service_manager::RunChildProcess();
36 } 36 }
37 // Reset CommandLine as most likely main() is going to use CommandLine too 37 // Reset CommandLine as most likely main() is going to use CommandLine too
38 // and expect to be able to initialize it. 38 // and expect to be able to initialize it.
39 base::CommandLine::Reset(); 39 base::CommandLine::Reset();
40 return MasterProcessMain(argc, argv); 40 return MasterProcessMain(argc, argv);
41 } 41 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698