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

Side by Side Diff: mojo/edk/embedder/embedder.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 | « mojo/edk/embedder/embedder.h ('k') | mojo/edk/embedder/embedder_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/embedder/embedder.h" 5 #include "mojo/edk/embedder/embedder.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/location.h" 8 #include "base/location.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "mojo/embedder/platform_support.h" 11 #include "mojo/edk/embedder/platform_support.h"
12 #include "mojo/system/channel.h" 12 #include "mojo/edk/system/channel.h"
13 #include "mojo/system/channel_endpoint.h" 13 #include "mojo/edk/system/channel_endpoint.h"
14 #include "mojo/system/core.h" 14 #include "mojo/edk/system/core.h"
15 #include "mojo/system/entrypoints.h" 15 #include "mojo/edk/system/entrypoints.h"
16 #include "mojo/system/message_in_transit.h" 16 #include "mojo/edk/system/message_in_transit.h"
17 #include "mojo/system/message_pipe_dispatcher.h" 17 #include "mojo/edk/system/message_pipe_dispatcher.h"
18 #include "mojo/system/platform_handle_dispatcher.h" 18 #include "mojo/edk/system/platform_handle_dispatcher.h"
19 #include "mojo/system/raw_channel.h" 19 #include "mojo/edk/system/raw_channel.h"
20 20
21 namespace mojo { 21 namespace mojo {
22 namespace embedder { 22 namespace embedder {
23 23
24 // This is defined here (instead of a header file), since it's opaque to the 24 // This is defined here (instead of a header file), since it's opaque to the
25 // outside world. But we need to define it before our (internal-only) functions 25 // outside world. But we need to define it before our (internal-only) functions
26 // that use it. 26 // that use it.
27 struct ChannelInfo { 27 struct ChannelInfo {
28 ChannelInfo() {} 28 ChannelInfo() {}
29 ~ChannelInfo() {} 29 ~ChannelInfo() {}
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 231
232 *platform_handle = 232 *platform_handle =
233 static_cast<system::PlatformHandleDispatcher*>(dispatcher.get()) 233 static_cast<system::PlatformHandleDispatcher*>(dispatcher.get())
234 ->PassPlatformHandle() 234 ->PassPlatformHandle()
235 .Pass(); 235 .Pass();
236 return MOJO_RESULT_OK; 236 return MOJO_RESULT_OK;
237 } 237 }
238 238
239 } // namespace embedder 239 } // namespace embedder
240 } // namespace mojo 240 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/edk/embedder/embedder.h ('k') | mojo/edk/embedder/embedder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698