content/child/child_thread_impl.cc - Issue 1676913002: [mojo] Delete third_party/mojo

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 1676913002: [mojo] Delete third_party/mojo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: let's try that again Created 4 years, 10 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:

Index: content/child/child_thread_impl.cc

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

index 7e815ba58460896773dd556c8415079c7679352e..dbf6c3be0c2d5c13d2029ae0554bf191ce8b443f 100644

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

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

@@ -62,7 +62,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"

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

#if defined(USE_OZONE)

#include "ui/ozone/public/client_native_pixmap_factory.h"

@@ -696,8 +696,8 @@ void ChildThreadImpl::OnBindExternalMojoShellHandle(

void ChildThreadImpl::OnSetMojoParentPipeHandle(

const IPC::PlatformFileForTransit& file) {

- mojo::embedder::SetParentPipeHandle(

- mojo::embedder::ScopedPlatformHandle(mojo::embedder::PlatformHandle(

+ mojo::edk::SetParentPipeHandle(

+ mojo::edk::ScopedPlatformHandle(mojo::edk::PlatformHandle(

IPC::PlatformFileForTransitToPlatformFile(file))));

}

« no previous file with comments | « content/child/BUILD.gn ('k') | content/common/BUILD.gn » ('j') | no next file with comments »