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

Unified Diff: services/service_manager/standalone/desktop/main_helper.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « services/service_manager/standalone/context.cc ('k') | services/service_manager/switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/service_manager/standalone/desktop/main_helper.cc
diff --git a/services/service_manager/standalone/desktop/main_helper.cc b/services/service_manager/standalone/desktop/main_helper.cc
index 45d2f03f7fe1f7ad937da3d886269c3f6a31ebcd..d3f11c8c588e64db843f2bcf38ad02a972d2db02 100644
--- a/services/service_manager/standalone/desktop/main_helper.cc
+++ b/services/service_manager/standalone/desktop/main_helper.cc
@@ -15,6 +15,7 @@
#include "base/strings/string_split.h"
#include "base/strings/utf_string_conversions.h"
#include "services/service_manager/runner/common/switches.h"
+#include "services/service_manager/runner/host/child_process.h"
#include "services/service_manager/runner/init.h"
#include "services/service_manager/standalone/desktop/launcher_process.h"
@@ -28,6 +29,8 @@
int StandaloneServiceManagerMain(int argc, char** argv) {
base::CommandLine::Init(argc, argv);
+ const base::CommandLine& command_line =
+ *base::CommandLine::ForCurrentProcess();
base::AtExitManager at_exit;
InitializeLogging();
@@ -37,6 +40,9 @@
base::RouteStdioToConsole(false);
#endif
+ if (command_line.HasSwitch(switches::kChildProcess))
+ return ChildProcessMain();
+
return LauncherProcessMain();
}
« no previous file with comments | « services/service_manager/standalone/context.cc ('k') | services/service_manager/switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698