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

Unified Diff: ipc/ipc_channel_proxy.cc

Issue 1185133006: IPC: Make ChannelReader inherit from SupportsAttachmentBrokering. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Comments from tsepez. 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
« no previous file with comments | « ipc/ipc_channel_proxy.h ('k') | ipc/ipc_channel_proxy_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ipc/ipc_channel_proxy.cc
diff --git a/ipc/ipc_channel_proxy.cc b/ipc/ipc_channel_proxy.cc
index 57676189b8d5c3beef9fcb8674d03bf6906da89e..269fd6a8a6241d6ccc647e319ce155d568a2908d 100644
--- a/ipc/ipc_channel_proxy.cc
+++ b/ipc/ipc_channel_proxy.cc
@@ -347,7 +347,6 @@ void ChannelProxy::Context::Send(Message* message) {
base::Passed(scoped_ptr<Message>(message))));
}
-
//-----------------------------------------------------------------------------
// static
@@ -355,9 +354,10 @@ scoped_ptr<ChannelProxy> ChannelProxy::Create(
const IPC::ChannelHandle& channel_handle,
Channel::Mode mode,
Listener* listener,
- const scoped_refptr<base::SingleThreadTaskRunner>& ipc_task_runner) {
+ const scoped_refptr<base::SingleThreadTaskRunner>& ipc_task_runner,
+ AttachmentBroker* broker) {
scoped_ptr<ChannelProxy> channel(new ChannelProxy(listener, ipc_task_runner));
- channel->Init(channel_handle, mode, true);
+ channel->Init(channel_handle, mode, true, broker);
return channel.Pass();
}
@@ -396,7 +396,8 @@ ChannelProxy::~ChannelProxy() {
void ChannelProxy::Init(const IPC::ChannelHandle& channel_handle,
Channel::Mode mode,
- bool create_pipe_now) {
+ bool create_pipe_now,
+ AttachmentBroker* broker) {
#if defined(OS_POSIX)
// When we are creating a server on POSIX, we need its file descriptor
// to be created immediately so that it can be accessed and passed
@@ -406,8 +407,7 @@ void ChannelProxy::Init(const IPC::ChannelHandle& channel_handle,
create_pipe_now = true;
}
#endif // defined(OS_POSIX)
- Init(ChannelFactory::Create(channel_handle, mode),
- create_pipe_now);
+ Init(ChannelFactory::Create(channel_handle, mode, broker), create_pipe_now);
}
void ChannelProxy::Init(scoped_ptr<ChannelFactory> factory,
« no previous file with comments | « ipc/ipc_channel_proxy.h ('k') | ipc/ipc_channel_proxy_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698