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

Unified Diff: content/child/child_thread_impl.cc

Issue 1387963004: Create a broker interface for the new Mojo EDK so that the browser can create and duplicate messa... (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: presubmit whitespace error 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/child/child_thread_impl.cc
diff --git a/content/child/child_thread_impl.cc b/content/child/child_thread_impl.cc
index be915a08df82b9be4e991680f17a9c066617e54b..e21898084dde7ae178810e4d730c972ceef9477b 100644
--- a/content/child/child_thread_impl.cc
+++ b/content/child/child_thread_impl.cc
@@ -61,6 +61,7 @@
#include "ipc/ipc_sync_channel.h"
#include "ipc/ipc_sync_message_filter.h"
#include "ipc/mojo/ipc_channel_mojo.h"
+#include "third_party/mojo/src/mojo/edk/embedder/embedder.h"
#if defined(TCMALLOC_TRACE_MEMORY_SUPPORTED)
#include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h"
@@ -658,6 +659,10 @@ bool ChildThreadImpl::OnMessageReceived(const IPC::Message& msg) {
OnProcessBackgrounded)
IPC_MESSAGE_HANDLER(MojoMsg_BindExternalMojoShellHandle,
OnBindExternalMojoShellHandle)
+#if defined(OS_WIN)
+ IPC_MESSAGE_HANDLER(ChildProcessMsg_SetMojoParentPipeHandle,
+ OnSetMojoParentPipeHandle)
+#endif
#if defined(USE_TCMALLOC)
IPC_MESSAGE_HANDLER(ChildProcessMsg_GetTcmallocStats, OnGetTcmallocStats)
#endif
@@ -730,6 +735,13 @@ void ChildThreadImpl::OnBindExternalMojoShellHandle(
#endif // defined(MOJO_SHELL_CLIENT)
}
+#if defined(OS_WIN)
+void ChildThreadImpl::OnSetMojoParentPipeHandle(
+ const IPC::PlatformFileForTransit& file) {
+ mojo::embedder::SetParentPipeHandle(file);
+}
+#endif
+
#if defined(USE_TCMALLOC)
void ChildThreadImpl::OnGetTcmallocStats() {
std::string result;

Powered by Google App Engine
This is Rietveld 408576698