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

Unified Diff: content/child/child_thread_impl.cc

Issue 2366443004: Re-enable ChannelMojo between Service process <-> service utility process. (Closed)
Patch Set: Created 4 years, 3 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: content/child/child_thread_impl.cc
diff --git a/content/child/child_thread_impl.cc b/content/child/child_thread_impl.cc
index c7dc71c6c6e14a6fa9bdfb99406ee512a3bf9c4c..2d8af69163c2148dbfc63513644c3cefec7496b5 100644
--- a/content/child/child_thread_impl.cc
+++ b/content/child/child_thread_impl.cc
@@ -296,10 +296,11 @@ ChildThreadImpl::Options::Options()
: channel_name(base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
switches::kProcessChannelID)),
use_mojo_channel(base::CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kMojoApplicationChannelToken)),
+ switches::kMojoApplicationChannelToken) ||
+ base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kMojoChannelToken)),
auto_start_mojo_shell_connection(true),
- connect_to_browser(false) {
-}
+ connect_to_browser(false) {}
ChildThreadImpl::Options::Options(const Options& other) = default;
« 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