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

Unified Diff: content/browser/renderer_host/render_process_host_impl.cc

Issue 1476643002: mustash: Enable connections to mus from the Chrome renderer [take 2] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Don't create a RenderWidgetWindowTreeeClientFactory in tests Created 5 years, 1 month 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
Index: content/browser/renderer_host/render_process_host_impl.cc
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index c1dffde8e379acdfdbd7d7ca21ac446018c28314..adaeeb07f9d494b5b9c6f2557ebe90d1d757738d 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -574,6 +574,10 @@ RenderProcessHostImpl::RenderProcessHostImpl(
IPC::AttachmentBrokerPrivileged::CreateBrokerIfNeeded();
#endif // defined(OS_MACOSX) && !defined(OS_IOS)
#endif // USE_ATTACHMENT_BROKER
+
+#if defined(MOJO_SHELL_CLIENT)
+ RegisterChildWithExternalShell(id_, this);
+#endif
}
// static
@@ -2439,9 +2443,8 @@ void RenderProcessHostImpl::OnProcessLaunched() {
NotificationService::NoDetails());
#if defined(MOJO_SHELL_CLIENT)
- // Send a handle that the external Mojo shell can use to pass an Application
- // request to the child.
- RegisterChildWithExternalShell(id_, GetHandle(), this);
+ // Send the mojo shell handle to the renderer.
+ SendExternalMojoShellHandleToChild(GetHandle(), this);
#endif
// Allow Mojo to be setup before the renderer sees any Chrome IPC messages.

Powered by Google App Engine
This is Rietveld 408576698