ipc/mojo/ipc_channel_mojo.cc - Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public

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: ipc/mojo/ipc_channel_mojo.cc

Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: merge 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: ipc/mojo/ipc_channel_mojo.cc

diff --git a/ipc/mojo/ipc_channel_mojo.cc b/ipc/mojo/ipc_channel_mojo.cc

index 22f1ca5bc5d96f248b866313387f5ca31e036abc..05ce4190e976863a19c9e4efc264e9417a650042 100644

--- a/ipc/mojo/ipc_channel_mojo.cc

+++ b/ipc/mojo/ipc_channel_mojo.cc

@@ -17,8 +17,8 @@

#include "ipc/mojo/ipc_mojo_bootstrap.h"

#include "ipc/mojo/ipc_mojo_handle_attachment.h"

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

+#include "mojo/public/cpp/bindings/binding.h"

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

-#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"

#if defined(OS_POSIX) && !defined(OS_NACL)

#include "ipc/ipc_platform_file_attachment_posix.h"

« no previous file with comments | « ipc/mojo/ipc_channel_mojo.h ('k') | ipc/mojo/ipc_message_pipe_reader.h » ('j') | no next file with comments »