| Index: content/child/child_thread_impl.cc
|
| diff --git a/content/child/child_thread_impl.cc b/content/child/child_thread_impl.cc
|
| index 845eabdd720c897b54c5fa5c7766044d0eb0957d..01cf63a69f910ac274b73a06a42987edb433d560 100644
|
| --- a/content/child/child_thread_impl.cc
|
| +++ b/content/child/child_thread_impl.cc
|
| @@ -73,11 +73,6 @@
|
| #include "ui/ozone/public/client_native_pixmap_factory.h"
|
| #endif
|
|
|
| -#if defined(MOJO_SHELL_CLIENT)
|
| -#include "content/common/mojo/mojo_messages.h"
|
| -#include "content/common/mojo/mojo_shell_connection_impl.h"
|
| -#endif
|
| -
|
| using tracked_objects::ThreadData;
|
|
|
| namespace content {
|
| @@ -659,9 +654,6 @@
|
| #if defined(USE_TCMALLOC)
|
| IPC_MESSAGE_HANDLER(ChildProcessMsg_GetTcmallocStats, OnGetTcmallocStats)
|
| #endif
|
| -#if defined(MOJO_SHELL_CLIENT)
|
| - IPC_MESSAGE_HANDLER(MojoMsg_BindControllerHandle, OnBindControllerHandle)
|
| -#endif
|
| IPC_MESSAGE_UNHANDLED(handled = false)
|
| IPC_END_MESSAGE_MAP()
|
|
|
| @@ -726,21 +718,6 @@
|
| }
|
| #endif
|
|
|
| -#if defined(MOJO_SHELL_CLIENT)
|
| -void ChildThreadImpl::OnBindControllerHandle(
|
| - const IPC::PlatformFileForTransit& file) {
|
| -#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
|
| -
|
| ChildThreadImpl* ChildThreadImpl::current() {
|
| return g_lazy_tls.Pointer()->Get();
|
| }
|
|
|