| OLD | NEW |
| 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_SYSTEM_MAPPING_TABLE_H_ | 5 #ifndef MOJO_EDK_SYSTEM_MAPPING_TABLE_H_ |
| 6 #define MOJO_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/macros.h" | 13 #include "base/macros.h" |
| 14 #include "base/memory/scoped_ptr.h" | 14 #include "base/memory/scoped_ptr.h" |
| 15 #include "mojo/edk/system/system_impl_export.h" |
| 15 #include "mojo/public/c/system/types.h" | 16 #include "mojo/public/c/system/types.h" |
| 16 #include "mojo/system/system_impl_export.h" | |
| 17 | 17 |
| 18 namespace mojo { | 18 namespace mojo { |
| 19 | 19 |
| 20 namespace embedder { | 20 namespace embedder { |
| 21 class PlatformSharedBufferMapping; | 21 class PlatformSharedBufferMapping; |
| 22 } | 22 } |
| 23 | 23 |
| 24 namespace system { | 24 namespace system { |
| 25 | 25 |
| 26 class Core; | 26 class Core; |
| (...skipping 25 matching lines...) Expand all Loading... |
| 52 typedef base::hash_map<uintptr_t, embedder::PlatformSharedBufferMapping*> | 52 typedef base::hash_map<uintptr_t, embedder::PlatformSharedBufferMapping*> |
| 53 AddressToMappingMap; | 53 AddressToMappingMap; |
| 54 AddressToMappingMap address_to_mapping_map_; | 54 AddressToMappingMap address_to_mapping_map_; |
| 55 | 55 |
| 56 DISALLOW_COPY_AND_ASSIGN(MappingTable); | 56 DISALLOW_COPY_AND_ASSIGN(MappingTable); |
| 57 }; | 57 }; |
| 58 | 58 |
| 59 } // namespace system | 59 } // namespace system |
| 60 } // namespace mojo | 60 } // namespace mojo |
| 61 | 61 |
| 62 #endif // MOJO_SYSTEM_MAPPING_TABLE_H_ | 62 #endif // MOJO_EDK_SYSTEM_MAPPING_TABLE_H_ |
| OLD | NEW |