Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(234)

Unified Diff: ipc/mojo/ipc_channel_mojo.h

Issue 1185133006: IPC: Make ChannelReader inherit from SupportsAttachmentBrokering. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase against https://codereview.chromium.org/1180313007/. Created 5 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: ipc/mojo/ipc_channel_mojo.h
diff --git a/ipc/mojo/ipc_channel_mojo.h b/ipc/mojo/ipc_channel_mojo.h
index 3a1d98a8a97445cb9c72c7455c18a6ce2c20386a..13993cf18641d095e0edb3b2364b5e89794e3917 100644
--- a/ipc/mojo/ipc_channel_mojo.h
+++ b/ipc/mojo/ipc_channel_mojo.h
@@ -74,20 +74,29 @@ class IPC_MOJO_EXPORT ChannelMojo
scoped_refptr<base::TaskRunner> io_runner,
const ChannelHandle& channel_handle,
Mode mode,
- Listener* listener);
+ Listener* listener,
+ AttachmentBroker* broker);
// Create a factory object for ChannelMojo.
// The factory is used to create Mojo-based ChannelProxy family.
// |host| must not be null.
+ // TODO(erikchen): Remove default parameter for |broker|. It exists only to
+ // make the upcoming refactor decomposable into smaller CLs.
+ // http://crbug.com/493414.
static scoped_ptr<ChannelFactory> CreateServerFactory(
Delegate* delegate,
scoped_refptr<base::TaskRunner> io_runner,
- const ChannelHandle& channel_handle);
+ const ChannelHandle& channel_handle,
+ AttachmentBroker* broker = nullptr);
+ // TODO(erikchen): Remove default parameter for |broker|. It exists only to
+ // make the upcoming refactor decomposable into smaller CLs.
+ // http://crbug.com/493414.
static scoped_ptr<ChannelFactory> CreateClientFactory(
Delegate* delegate,
scoped_refptr<base::TaskRunner> io_runner,
- const ChannelHandle& channel_handle);
+ const ChannelHandle& channel_handle,
+ AttachmentBroker* broker = nullptr);
~ChannelMojo() override;
@@ -129,7 +138,8 @@ class IPC_MOJO_EXPORT ChannelMojo
scoped_refptr<base::TaskRunner> io_runner,
const ChannelHandle& channel_handle,
Mode mode,
- Listener* listener);
+ Listener* listener,
+ AttachmentBroker* broker);
void CreateMessagingPipe(mojo::embedder::ScopedPlatformHandle handle,
const CreateMessagingPipeCallback& callback);

Powered by Google App Engine
This is Rietveld 408576698