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

Side by Side Diff: mojo/system/channel_endpoint.cc

Issue 623883002: Revert "Move mojo edk into mojo/edk" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 unified diff | Download patch
« no previous file with comments | « mojo/system/channel_endpoint.h ('k') | mojo/system/channel_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "mojo/edk/system/channel_endpoint.h" 5 #include "mojo/system/channel_endpoint.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "mojo/edk/system/channel.h" 8 #include "mojo/system/channel.h"
9 #include "mojo/edk/system/message_pipe.h" 9 #include "mojo/system/message_pipe.h"
10 #include "mojo/edk/system/transport_data.h" 10 #include "mojo/system/transport_data.h"
11 11
12 namespace mojo { 12 namespace mojo {
13 namespace system { 13 namespace system {
14 14
15 ChannelEndpoint::ChannelEndpoint(MessagePipe* message_pipe, unsigned port) 15 ChannelEndpoint::ChannelEndpoint(MessagePipe* message_pipe, unsigned port)
16 : state_(STATE_NORMAL), 16 : state_(STATE_NORMAL),
17 message_pipe_(message_pipe), 17 message_pipe_(message_pipe),
18 port_(port), 18 port_(port),
19 channel_(), 19 channel_(),
20 local_id_(MessageInTransit::kInvalidEndpointId), 20 local_id_(MessageInTransit::kInvalidEndpointId),
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 DCHECK_NE(remote_id_, MessageInTransit::kInvalidEndpointId); 174 DCHECK_NE(remote_id_, MessageInTransit::kInvalidEndpointId);
175 175
176 message->SerializeAndCloseDispatchers(channel_); 176 message->SerializeAndCloseDispatchers(channel_);
177 message->set_source_id(local_id_); 177 message->set_source_id(local_id_);
178 message->set_destination_id(remote_id_); 178 message->set_destination_id(remote_id_);
179 return channel_->WriteMessage(message.Pass()); 179 return channel_->WriteMessage(message.Pass());
180 } 180 }
181 181
182 } // namespace system 182 } // namespace system
183 } // namespace mojo 183 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/system/channel_endpoint.h ('k') | mojo/system/channel_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698