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

Unified Diff: shell/child_process.cc

Issue 1043123004: Shell: Remove various child process type stuff. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: NULL -> nullptr Created 5 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « shell/child_process.h ('k') | shell/child_process_host.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: shell/child_process.cc
diff --git a/shell/child_process.cc b/shell/child_process.cc
index 3480b20eabc73b6271cfed45d39b74b1ecbc4f9f..a811384bea091a21da015d7bff75e147ce08fec8 100644
--- a/shell/child_process.cc
+++ b/shell/child_process.cc
@@ -6,7 +6,6 @@
#include "base/command_line.h"
#include "base/logging.h"
-#include "base/strings/string_number_conversions.h"
#include "mojo/edk/embedder/platform_channel_pair.h"
#include "shell/app_child_process.h"
#include "shell/switches.h"
@@ -20,32 +19,18 @@ ChildProcess::~ChildProcess() {
// static
scoped_ptr<ChildProcess> ChildProcess::Create(
const base::CommandLine& command_line) {
- if (!command_line.HasSwitch(switches::kChildProcessType))
+ if (!command_line.HasSwitch(switches::kChildProcess))
return scoped_ptr<ChildProcess>();
- int type_as_int;
- CHECK(base::StringToInt(
- command_line.GetSwitchValueASCII(switches::kChildProcessType),
- &type_as_int));
-
- scoped_ptr<ChildProcess> rv;
- switch (type_as_int) {
- case TYPE_APP:
- rv.reset(new AppChildProcess());
- break;
- default:
- CHECK(false) << "Invalid child process type";
- break;
- }
-
- if (rv) {
- rv->platform_channel_ =
- embedder::PlatformChannelPair::PassClientHandleFromParentProcess(
- command_line);
- CHECK(rv->platform_channel_.is_valid());
- }
-
- return rv.Pass();
+ scoped_ptr<ChildProcess> rv(new AppChildProcess());
+ if (!rv)
+ return nullptr;
+
+ rv->platform_channel_ =
+ embedder::PlatformChannelPair::PassClientHandleFromParentProcess(
+ command_line);
+ CHECK(rv->platform_channel_.is_valid());
+ return rv;
}
ChildProcess::ChildProcess() {
« no previous file with comments | « shell/child_process.h ('k') | shell/child_process_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698