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

Side by Side Diff: mojo/edk/system/mapping_table.h

Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 years, 1 month 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/system/handle_table.h ('k') | mojo/edk/system/master_impl.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 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 #ifndef MOJO_EDK_SYSTEM_MAPPING_TABLE_H_ 5 #ifndef MOJO_EDK_SYSTEM_MAPPING_TABLE_H_
6 #define MOJO_EDK_SYSTEM_MAPPING_TABLE_H_ 6 #define MOJO_EDK_SYSTEM_MAPPING_TABLE_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/containers/hash_tables.h" 12 #include "base/containers/hash_tables.h"
13 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 #include "mojo/edk/system/system_impl_export.h" 14 #include "mojo/edk/system/system_impl_export.h"
15 #include "third_party/mojo/src/mojo/public/c/system/types.h" 15 #include "mojo/public/c/system/types.h"
16 #include "third_party/mojo/src/mojo/public/cpp/system/macros.h" 16 #include "mojo/public/cpp/system/macros.h"
17 17
18 namespace mojo { 18 namespace mojo {
19 19
20 namespace edk { 20 namespace edk {
21 class Core; 21 class Core;
22 class PlatformSharedBufferMapping; 22 class PlatformSharedBufferMapping;
23 23
24 // Test-only function (defined/used in embedder/test_embedder.cc). Declared here 24 // Test-only function (defined/used in embedder/test_embedder.cc). Declared here
25 // so it can be friended. 25 // so it can be friended.
26 namespace internal { 26 namespace internal {
(...skipping 21 matching lines...) Expand all
48 base::hash_map<void*, PlatformSharedBufferMapping*>; 48 base::hash_map<void*, PlatformSharedBufferMapping*>;
49 AddressToMappingMap address_to_mapping_map_; 49 AddressToMappingMap address_to_mapping_map_;
50 50
51 MOJO_DISALLOW_COPY_AND_ASSIGN(MappingTable); 51 MOJO_DISALLOW_COPY_AND_ASSIGN(MappingTable);
52 }; 52 };
53 53
54 } // namespace edk 54 } // namespace edk
55 } // namespace mojo 55 } // namespace mojo
56 56
57 #endif // MOJO_EDK_SYSTEM_MAPPING_TABLE_H_ 57 #endif // MOJO_EDK_SYSTEM_MAPPING_TABLE_H_
OLDNEW
« no previous file with comments | « mojo/edk/system/handle_table.h ('k') | mojo/edk/system/master_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698