| 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> |
| (...skipping 18 matching lines...) Expand all Loading... |
| 29 | 29 |
| 30 #if defined(OS_WIN) | 30 #if defined(OS_WIN) |
| 31 #include "base/win/scoped_handle.h" | 31 #include "base/win/scoped_handle.h" |
| 32 #endif | 32 #endif |
| 33 | 33 |
| 34 namespace base { | 34 namespace base { |
| 35 class CommandLine; | 35 class CommandLine; |
| 36 class FilePath; | 36 class FilePath; |
| 37 } | 37 } |
| 38 | 38 |
| 39 namespace discardable_memory { |
| 40 class ClientDiscardableSharedMemoryManager; |
| 41 } |
| 42 |
| 39 namespace IPC { | 43 namespace IPC { |
| 40 struct ChannelHandle; | 44 struct ChannelHandle; |
| 41 } | 45 } |
| 42 | 46 |
| 43 namespace content { | 47 namespace content { |
| 44 | 48 |
| 45 class PpapiBlinkPlatformImpl; | 49 class PpapiBlinkPlatformImpl; |
| 46 | 50 |
| 47 #if defined(COMPILER_MSVC) | 51 #if defined(COMPILER_MSVC) |
| 48 // See explanation for other RenderViewHostImpl which is the same issue. | 52 // See explanation for other RenderViewHostImpl which is the same issue. |
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 174 // The BlinkPlatformImpl implementation. | 178 // The BlinkPlatformImpl implementation. |
| 175 std::unique_ptr<PpapiBlinkPlatformImpl> blink_platform_impl_; | 179 std::unique_ptr<PpapiBlinkPlatformImpl> blink_platform_impl_; |
| 176 | 180 |
| 177 #if defined(OS_WIN) | 181 #if defined(OS_WIN) |
| 178 // Caches the handle to the peer process if this is a broker. | 182 // Caches the handle to the peer process if this is a broker. |
| 179 base::win::ScopedHandle peer_handle_; | 183 base::win::ScopedHandle peer_handle_; |
| 180 #endif | 184 #endif |
| 181 | 185 |
| 182 variations::ChildProcessFieldTrialSyncer field_trial_syncer_; | 186 variations::ChildProcessFieldTrialSyncer field_trial_syncer_; |
| 183 | 187 |
| 188 std::unique_ptr<discardable_memory::ClientDiscardableSharedMemoryManager> |
| 189 discardable_shared_memory_manager_; |
| 190 |
| 184 DISALLOW_IMPLICIT_CONSTRUCTORS(PpapiThread); | 191 DISALLOW_IMPLICIT_CONSTRUCTORS(PpapiThread); |
| 185 }; | 192 }; |
| 186 | 193 |
| 187 #if defined(COMPILER_MSVC) | 194 #if defined(COMPILER_MSVC) |
| 188 #pragma warning(pop) | 195 #pragma warning(pop) |
| 189 #endif | 196 #endif |
| 190 | 197 |
| 191 } // namespace content | 198 } // namespace content |
| 192 | 199 |
| 193 #endif // CONTENT_PPAPI_PLUGIN_PPAPI_THREAD_H_ | 200 #endif // CONTENT_PPAPI_PLUGIN_PPAPI_THREAD_H_ |
| OLD | NEW |