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

Side by Side Diff: mojo/system/message_pipe.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/message_pipe.h ('k') | mojo/system/message_pipe_dispatcher.h » ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/message_pipe.h" 5 #include "mojo/system/message_pipe.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "mojo/edk/system/channel_endpoint.h" 8 #include "mojo/system/channel_endpoint.h"
9 #include "mojo/edk/system/local_message_pipe_endpoint.h" 9 #include "mojo/system/local_message_pipe_endpoint.h"
10 #include "mojo/edk/system/message_in_transit.h" 10 #include "mojo/system/message_in_transit.h"
11 #include "mojo/edk/system/message_pipe_dispatcher.h" 11 #include "mojo/system/message_pipe_dispatcher.h"
12 #include "mojo/edk/system/message_pipe_endpoint.h" 12 #include "mojo/system/message_pipe_endpoint.h"
13 #include "mojo/edk/system/proxy_message_pipe_endpoint.h" 13 #include "mojo/system/proxy_message_pipe_endpoint.h"
14 14
15 namespace mojo { 15 namespace mojo {
16 namespace system { 16 namespace system {
17 17
18 // static 18 // static
19 MessagePipe* MessagePipe::CreateLocalLocal() { 19 MessagePipe* MessagePipe::CreateLocalLocal() {
20 MessagePipe* message_pipe = new MessagePipe(); 20 MessagePipe* message_pipe = new MessagePipe();
21 message_pipe->endpoints_[0].reset(new LocalMessagePipeEndpoint()); 21 message_pipe->endpoints_[0].reset(new LocalMessagePipeEndpoint());
22 message_pipe->endpoints_[1].reset(new LocalMessagePipeEndpoint()); 22 message_pipe->endpoints_[1].reset(new LocalMessagePipeEndpoint());
23 return message_pipe; 23 return message_pipe;
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 MojoResult MessagePipe::HandleControlMessage( 277 MojoResult MessagePipe::HandleControlMessage(
278 unsigned /*port*/, 278 unsigned /*port*/,
279 scoped_ptr<MessageInTransit> message) { 279 scoped_ptr<MessageInTransit> message) {
280 LOG(WARNING) << "Unrecognized MessagePipe control message subtype " 280 LOG(WARNING) << "Unrecognized MessagePipe control message subtype "
281 << message->subtype(); 281 << message->subtype();
282 return MOJO_RESULT_UNKNOWN; 282 return MOJO_RESULT_UNKNOWN;
283 } 283 }
284 284
285 } // namespace system 285 } // namespace system
286 } // namespace mojo 286 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/system/message_pipe.h ('k') | mojo/system/message_pipe_dispatcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698