| Index: ipc/ipc_channel.h
|
| diff --git a/ipc/ipc_channel.h b/ipc/ipc_channel.h
|
| index 65c678b530dc832262c095b243965c7793ee2d86..a7a4315f0ddcc07507671c2a9fe3d72fde31fb52 100644
|
| --- a/ipc/ipc_channel.h
|
| +++ b/ipc/ipc_channel.h
|
| @@ -20,6 +20,7 @@
|
|
|
| namespace IPC {
|
|
|
| +class AttachmentBroker;
|
| class Listener;
|
|
|
| //------------------------------------------------------------------------------
|
| @@ -118,11 +119,15 @@ class IPC_EXPORT Channel : public Sender {
|
| //
|
| // TODO(morrita): Replace CreateByModeForProxy() with one of above Create*().
|
| //
|
| - static scoped_ptr<Channel> Create(
|
| - const IPC::ChannelHandle &channel_handle, Mode mode, Listener* listener);
|
| + static scoped_ptr<Channel> Create(const IPC::ChannelHandle& channel_handle,
|
| + Mode mode,
|
| + Listener* listener,
|
| + AttachmentBroker* broker);
|
|
|
| static scoped_ptr<Channel> CreateClient(
|
| - const IPC::ChannelHandle &channel_handle, Listener* listener);
|
| + const IPC::ChannelHandle& channel_handle,
|
| + Listener* listener,
|
| + AttachmentBroker* broker);
|
|
|
| // Channels on Windows are named by default and accessible from other
|
| // processes. On POSIX channels are anonymous by default and not accessible
|
| @@ -130,18 +135,26 @@ class IPC_EXPORT Channel : public Sender {
|
| // On Windows MODE_NAMED_SERVER is equivalent to MODE_SERVER and
|
| // MODE_NAMED_CLIENT is equivalent to MODE_CLIENT.
|
| static scoped_ptr<Channel> CreateNamedServer(
|
| - const IPC::ChannelHandle &channel_handle, Listener* listener);
|
| + const IPC::ChannelHandle& channel_handle,
|
| + Listener* listener,
|
| + AttachmentBroker* broker);
|
| static scoped_ptr<Channel> CreateNamedClient(
|
| - const IPC::ChannelHandle &channel_handle, Listener* listener);
|
| + const IPC::ChannelHandle& channel_handle,
|
| + Listener* listener,
|
| + AttachmentBroker* broker);
|
| #if defined(OS_POSIX)
|
| // An "open" named server accepts connections from ANY client.
|
| // The caller must then implement their own access-control based on the
|
| // client process' user Id.
|
| static scoped_ptr<Channel> CreateOpenNamedServer(
|
| - const IPC::ChannelHandle &channel_handle, Listener* listener);
|
| + const IPC::ChannelHandle& channel_handle,
|
| + Listener* listener,
|
| + AttachmentBroker* broker);
|
| #endif
|
| static scoped_ptr<Channel> CreateServer(
|
| - const IPC::ChannelHandle &channel_handle, Listener* listener);
|
| + const IPC::ChannelHandle& channel_handle,
|
| + Listener* listener,
|
| + AttachmentBroker* broker);
|
|
|
| ~Channel() override;
|
|
|
|
|