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

Unified Diff: content/child/child_thread_impl.cc

Issue 1452823003: Bind Application in renderer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . 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
« no previous file with comments | « content/child/child_thread_impl.h ('k') | content/common/BUILD.gn » ('j') | 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 01cf63a69f910ac274b73a06a42987edb433d560..be915a08df82b9be4e991680f17a9c066617e54b 100644
--- a/content/child/child_thread_impl.cc
+++ b/content/child/child_thread_impl.cc
@@ -52,6 +52,7 @@
#include "content/child/websocket_dispatcher.h"
#include "content/common/child_process_messages.h"
#include "content/common/in_process_child_thread_params.h"
+#include "content/common/mojo/mojo_messages.h"
#include "content/public/common/content_switches.h"
#include "ipc/attachment_broker.h"
#include "ipc/attachment_broker_unprivileged.h"
@@ -73,6 +74,10 @@
#include "ui/ozone/public/client_native_pixmap_factory.h"
#endif
+#if defined(MOJO_SHELL_CLIENT)
+#include "content/common/mojo/mojo_shell_connection_impl.h"
+#endif
+
using tracked_objects::ThreadData;
namespace content {
@@ -651,6 +656,8 @@ bool ChildThreadImpl::OnMessageReceived(const IPC::Message& msg) {
OnProfilingPhaseCompleted)
IPC_MESSAGE_HANDLER(ChildProcessMsg_SetProcessBackgrounded,
OnProcessBackgrounded)
+ IPC_MESSAGE_HANDLER(MojoMsg_BindExternalMojoShellHandle,
+ OnBindExternalMojoShellHandle)
#if defined(USE_TCMALLOC)
IPC_MESSAGE_HANDLER(ChildProcessMsg_GetTcmallocStats, OnGetTcmallocStats)
#endif
@@ -708,6 +715,21 @@ void ChildThreadImpl::OnProfilingPhaseCompleted(int profiling_phase) {
ThreadData::OnProfilingPhaseCompleted(profiling_phase);
}
+void ChildThreadImpl::OnBindExternalMojoShellHandle(
+ const IPC::PlatformFileForTransit& file) {
+#if defined(MOJO_SHELL_CLIENT)
+#if defined(OS_POSIX)
+ base::PlatformFile handle = file.fd;
+#elif defined(OS_WIN)
+ base::PlatformFile handle = file;
+#endif
+ mojo::ScopedMessagePipeHandle message_pipe =
+ mojo_shell_channel_init_.Init(handle, GetIOTaskRunner());
+ DCHECK(message_pipe.is_valid());
+ MojoShellConnectionImpl::CreateWithMessagePipe(message_pipe.Pass());
+#endif // defined(MOJO_SHELL_CLIENT)
+}
+
#if defined(USE_TCMALLOC)
void ChildThreadImpl::OnGetTcmallocStats() {
std::string result;
« no previous file with comments | « content/child/child_thread_impl.h ('k') | content/common/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698