ipc/ipc_channel_mojo.h - Issue 2069803003: Fold //ipc/mojo into //ipc.

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/ipc_channel_mojo.h

Issue 2069803003: Fold //ipc/mojo into //ipc. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mojo-ipc-deps

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:

Index: ipc/ipc_channel_mojo.h

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

similarity index 97%

rename from ipc/mojo/ipc_channel_mojo.h

rename to ipc/ipc_channel_mojo.h

index dd5500c75ecb6a1797f1131d2554aead96966967..774a82a2627ddaadb86bfee0413f954fa358006f 100644

--- a/ipc/mojo/ipc_channel_mojo.h

+++ b/ipc/ipc_channel_mojo.h

@@ -20,8 +20,8 @@

#include "ipc/ipc_channel.h"

#include "ipc/ipc_channel_factory.h"

#include "ipc/ipc_export.h"

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

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

+#include "ipc/ipc_message_pipe_reader.h"

+#include "ipc/ipc_mojo_bootstrap.h"

#include "mojo/public/cpp/system/core.h"

namespace IPC {

@@ -35,7 +35,7 @@ namespace IPC {

// TODO(morrita): Add APIs to create extra MessagePipes to let

// Mojo-based objects talk over this Channel.

-class IPC_MOJO_EXPORT ChannelMojo

+class IPC_EXPORT ChannelMojo

: public Channel,

public MojoBootstrap::Delegate,

public NON_EXPORTED_BASE(internal::MessagePipeReader::Delegate) {

« no previous file with comments | « ipc/ipc.mojom ('k') | ipc/ipc_channel_mojo.cc » ('j') | no next file with comments »