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

Unified Diff: mojo/system/message_pipe.cc

Issue 580123004: Mojo: Remove knowledge of Channel, etc. from ProxyMessagePipeEndpoint. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 | « mojo/system/message_pipe.h ('k') | mojo/system/message_pipe_endpoint.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/system/message_pipe.cc
diff --git a/mojo/system/message_pipe.cc b/mojo/system/message_pipe.cc
index c3dd57fab1590db426dea3ac38f64bfafe3ff6c2..2cff5df77e1bd56401dafdafab6d3d412b411c20 100644
--- a/mojo/system/message_pipe.cc
+++ b/mojo/system/message_pipe.cc
@@ -176,31 +176,25 @@ MojoResult MessagePipe::EnqueueMessage(unsigned port,
return EnqueueMessageInternal(port, message.Pass(), NULL);
}
-bool MessagePipe::Attach(unsigned port,
- ChannelEndpoint* channel_endpoint,
- Channel* channel,
- MessageInTransit::EndpointId local_id) {
+bool MessagePipe::Attach(unsigned port, ChannelEndpoint* channel_endpoint) {
DCHECK(port == 0 || port == 1);
DCHECK(channel_endpoint);
- DCHECK(channel);
- DCHECK_NE(local_id, MessageInTransit::kInvalidEndpointId);
base::AutoLock locker(lock_);
if (!endpoints_[port])
return false;
DCHECK_EQ(endpoints_[port]->GetType(), MessagePipeEndpoint::kTypeProxy);
- endpoints_[port]->Attach(channel_endpoint, channel, local_id);
+ endpoints_[port]->Attach(channel_endpoint);
return true;
}
-void MessagePipe::Run(unsigned port, MessageInTransit::EndpointId remote_id) {
+void MessagePipe::Run(unsigned port) {
DCHECK(port == 0 || port == 1);
- DCHECK_NE(remote_id, MessageInTransit::kInvalidEndpointId);
base::AutoLock locker(lock_);
DCHECK(endpoints_[port]);
- if (!endpoints_[port]->Run(remote_id))
+ if (!endpoints_[port]->Run())
endpoints_[port].reset();
}
« no previous file with comments | « mojo/system/message_pipe.h ('k') | mojo/system/message_pipe_endpoint.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698