OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 CONTENT_PPAPI_PLUGIN_PPAPI_THREAD_H_ | 5 #ifndef CONTENT_PPAPI_PLUGIN_PPAPI_THREAD_H_ |
6 #define CONTENT_PPAPI_PLUGIN_PPAPI_THREAD_H_ | 6 #define CONTENT_PPAPI_PLUGIN_PPAPI_THREAD_H_ |
7 | 7 |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <map> | 10 #include <map> |
| 11 #include <memory> |
11 #include <string> | 12 #include <string> |
12 | 13 |
13 #include "base/compiler_specific.h" | 14 #include "base/compiler_specific.h" |
14 #include "base/macros.h" | 15 #include "base/macros.h" |
15 #include "base/memory/scoped_ptr.h" | |
16 #include "base/process/process.h" | 16 #include "base/process/process.h" |
17 #include "base/scoped_native_library.h" | 17 #include "base/scoped_native_library.h" |
18 #include "build/build_config.h" | 18 #include "build/build_config.h" |
19 #include "content/child/child_thread_impl.h" | 19 #include "content/child/child_thread_impl.h" |
20 #include "content/public/common/pepper_plugin_info.h" | 20 #include "content/public/common/pepper_plugin_info.h" |
21 #include "ppapi/c/pp_module.h" | 21 #include "ppapi/c/pp_module.h" |
22 #include "ppapi/c/trusted/ppp_broker.h" | 22 #include "ppapi/c/trusted/ppp_broker.h" |
23 #include "ppapi/proxy/connection.h" | 23 #include "ppapi/proxy/connection.h" |
24 #include "ppapi/proxy/plugin_dispatcher.h" | 24 #include "ppapi/proxy/plugin_dispatcher.h" |
25 #include "ppapi/proxy/plugin_globals.h" | 25 #include "ppapi/proxy/plugin_globals.h" |
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
156 PP_Module local_pp_module_; | 156 PP_Module local_pp_module_; |
157 | 157 |
158 // See Dispatcher::Delegate::GetGloballySeenInstanceIDSet. | 158 // See Dispatcher::Delegate::GetGloballySeenInstanceIDSet. |
159 std::set<PP_Instance> globally_seen_instance_ids_; | 159 std::set<PP_Instance> globally_seen_instance_ids_; |
160 | 160 |
161 // The PluginDispatcher instances contained in the map are not owned by it. | 161 // The PluginDispatcher instances contained in the map are not owned by it. |
162 std::map<uint32_t, ppapi::proxy::PluginDispatcher*> plugin_dispatchers_; | 162 std::map<uint32_t, ppapi::proxy::PluginDispatcher*> plugin_dispatchers_; |
163 uint32_t next_plugin_dispatcher_id_; | 163 uint32_t next_plugin_dispatcher_id_; |
164 | 164 |
165 // The BlinkPlatformImpl implementation. | 165 // The BlinkPlatformImpl implementation. |
166 scoped_ptr<PpapiBlinkPlatformImpl> blink_platform_impl_; | 166 std::unique_ptr<PpapiBlinkPlatformImpl> blink_platform_impl_; |
167 | 167 |
168 #if defined(OS_WIN) | 168 #if defined(OS_WIN) |
169 // Caches the handle to the peer process if this is a broker. | 169 // Caches the handle to the peer process if this is a broker. |
170 base::win::ScopedHandle peer_handle_; | 170 base::win::ScopedHandle peer_handle_; |
171 #endif | 171 #endif |
172 | 172 |
173 DISALLOW_IMPLICIT_CONSTRUCTORS(PpapiThread); | 173 DISALLOW_IMPLICIT_CONSTRUCTORS(PpapiThread); |
174 }; | 174 }; |
175 | 175 |
176 #if defined(COMPILER_MSVC) | 176 #if defined(COMPILER_MSVC) |
177 #pragma warning(pop) | 177 #pragma warning(pop) |
178 #endif | 178 #endif |
179 | 179 |
180 } // namespace content | 180 } // namespace content |
181 | 181 |
182 #endif // CONTENT_PPAPI_PLUGIN_PPAPI_THREAD_H_ | 182 #endif // CONTENT_PPAPI_PLUGIN_PPAPI_THREAD_H_ |
OLD | NEW |