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

Unified Diff: mojo/runner/context.cc

Issue 1615253003: Updates DCHECK in mojo/runner/context.cc to match reality (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/runner/context.cc
diff --git a/mojo/runner/context.cc b/mojo/runner/context.cc
index 657d99ae228a99253c222382924d6dc903b964fc..1182da20f0050272e99d94a6dcd63215d5fdc5a4 100644
--- a/mojo/runner/context.cc
+++ b/mojo/runner/context.cc
@@ -224,10 +224,7 @@ bool Context::Init(const base::FilePath& shell_file_root) {
RegisterLocalAliases(package_manager_);
scoped_ptr<shell::NativeRunnerFactory> runner_factory;
- if (command_line.HasSwitch(switches::kEnableMultiprocess)) {
- runner_factory.reset(
- new OutOfProcessNativeRunnerFactory(task_runners_->blocking_pool()));
- } else {
+ if (command_line.HasSwitch(switches::kMojoSingleProcess)) {
#if defined(COMPONENT_BUILD)
LOG(ERROR) << "Running Mojo in single process component build, which isn't "
<< "supported because statics in apps interact. Use static build"
@@ -235,6 +232,9 @@ bool Context::Init(const base::FilePath& shell_file_root) {
#endif
runner_factory.reset(
new InProcessNativeRunnerFactory(task_runners_->blocking_pool()));
+ } else {
+ runner_factory.reset(
+ new OutOfProcessNativeRunnerFactory(task_runners_->blocking_pool()));
}
application_manager_.reset(new shell::ApplicationManager(
make_scoped_ptr(package_manager_), std::move(runner_factory),
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698