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

Side by Side Diff: ipc/mojo/ipc_channel_mojo.cc

Issue 621153003: Move mojo edk into mojo/edk (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix checkdeps 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 | « ipc/mojo/DEPS ('k') | ipc/mojo/ipc_channel_mojo_readers.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 "ipc/mojo/ipc_channel_mojo.h" 5 #include "ipc/mojo/ipc_channel_mojo.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/lazy_instance.h" 9 #include "base/lazy_instance.h"
10 #include "ipc/ipc_listener.h" 10 #include "ipc/ipc_listener.h"
11 #include "ipc/mojo/ipc_channel_mojo_readers.h" 11 #include "ipc/mojo/ipc_channel_mojo_readers.h"
12 #include "ipc/mojo/ipc_mojo_bootstrap.h" 12 #include "ipc/mojo/ipc_mojo_bootstrap.h"
13 #include "mojo/embedder/embedder.h" 13 #include "mojo/edk/embedder/embedder.h"
14 14
15 #if defined(OS_POSIX) && !defined(OS_NACL) 15 #if defined(OS_POSIX) && !defined(OS_NACL)
16 #include "ipc/file_descriptor_set_posix.h" 16 #include "ipc/file_descriptor_set_posix.h"
17 #endif 17 #endif
18 18
19 namespace IPC { 19 namespace IPC {
20 20
21 namespace { 21 namespace {
22 22
23 class MojoChannelFactory : public ChannelFactory { 23 class MojoChannelFactory : public ChannelFactory {
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 278
279 fdset->CommitAll(); 279 fdset->CommitAll();
280 } 280 }
281 281
282 return MOJO_RESULT_OK; 282 return MOJO_RESULT_OK;
283 } 283 }
284 284
285 #endif // defined(OS_POSIX) && !defined(OS_NACL) 285 #endif // defined(OS_POSIX) && !defined(OS_NACL)
286 286
287 } // namespace IPC 287 } // namespace IPC
OLDNEW
« no previous file with comments | « ipc/mojo/DEPS ('k') | ipc/mojo/ipc_channel_mojo_readers.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698