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

Side by Side Diff: mojo/system/core.h

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/constants.h ('k') | mojo/system/core.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 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 #ifndef MOJO_EDK_SYSTEM_CORE_H_ 5 #ifndef MOJO_SYSTEM_CORE_H_
6 #define MOJO_EDK_SYSTEM_CORE_H_ 6 #define MOJO_SYSTEM_CORE_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "base/memory/ref_counted.h" 11 #include "base/memory/ref_counted.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/synchronization/lock.h" 13 #include "base/synchronization/lock.h"
14 #include "mojo/edk/system/handle_table.h"
15 #include "mojo/edk/system/mapping_table.h"
16 #include "mojo/edk/system/memory.h"
17 #include "mojo/edk/system/system_impl_export.h"
18 #include "mojo/public/c/system/buffer.h" 14 #include "mojo/public/c/system/buffer.h"
19 #include "mojo/public/c/system/data_pipe.h" 15 #include "mojo/public/c/system/data_pipe.h"
20 #include "mojo/public/c/system/message_pipe.h" 16 #include "mojo/public/c/system/message_pipe.h"
21 #include "mojo/public/c/system/types.h" 17 #include "mojo/public/c/system/types.h"
18 #include "mojo/system/handle_table.h"
19 #include "mojo/system/mapping_table.h"
20 #include "mojo/system/memory.h"
21 #include "mojo/system/system_impl_export.h"
22 22
23 namespace mojo { 23 namespace mojo {
24 24
25 namespace embedder { 25 namespace embedder {
26 class PlatformSupport; 26 class PlatformSupport;
27 } 27 }
28 28
29 namespace system { 29 namespace system {
30 30
31 class Dispatcher; 31 class Dispatcher;
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 146
147 base::Lock mapping_table_lock_; // Protects |mapping_table_|. 147 base::Lock mapping_table_lock_; // Protects |mapping_table_|.
148 MappingTable mapping_table_; 148 MappingTable mapping_table_;
149 149
150 DISALLOW_COPY_AND_ASSIGN(Core); 150 DISALLOW_COPY_AND_ASSIGN(Core);
151 }; 151 };
152 152
153 } // namespace system 153 } // namespace system
154 } // namespace mojo 154 } // namespace mojo
155 155
156 #endif // MOJO_EDK_SYSTEM_CORE_H_ 156 #endif // MOJO_SYSTEM_CORE_H_
OLDNEW
« no previous file with comments | « mojo/system/constants.h ('k') | mojo/system/core.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698