content/child/child_thread_impl.cc - Issue 2074453003: Move ScopedIPCSupport to mojo/edk/embedder and the mojo::edk namespace.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/child/child_thread_impl.cc

Issue 2074453003: Move ScopedIPCSupport to mojo/edk/embedder and the mojo::edk namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 4 years, 6 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

Index: content/child/child_thread_impl.cc

diff --git a/content/child/child_thread_impl.cc b/content/child/child_thread_impl.cc

index 544d65352daab27f6d5d5817ffdea0946d999386..047c43dd4b8b49440fdb59c01902a67687ac20b0 100644

--- a/content/child/child_thread_impl.cc

+++ b/content/child/child_thread_impl.cc

@@ -65,10 +65,10 @@

#include "ipc/ipc_sync_channel.h"

#include "ipc/ipc_sync_message_filter.h"

#include "ipc/mojo/ipc_channel_mojo.h"

-#include "ipc/mojo/scoped_ipc_support.h"

#include "mojo/edk/embedder/embedder.h"

#include "mojo/edk/embedder/named_platform_channel_pair.h"

#include "mojo/edk/embedder/platform_channel_pair.h"

+#include "mojo/edk/embedder/scoped_ipc_support.h"

#include "services/shell/runner/common/client_util.h"

#if defined(OS_POSIX)

@@ -398,7 +398,7 @@ void ChildThreadImpl::Init(const Options& options) {

if (!IsInBrowserProcess()) {

// Don't double-initialize IPC support in single-process mode.

- mojo_ipc_support_.reset(new IPC::ScopedIPCSupport(GetIOTaskRunner()));

+ mojo_ipc_support_.reset(new mojo::edk::ScopedIPCSupport(GetIOTaskRunner()));

InitializeMojoIPCChannel();

}

if (shell::ShellIsRemote()) {

« no previous file with comments | « content/child/child_thread_impl.h ('k') | content/content_common.gypi » ('j') | no next file with comments »