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

Side by Side Diff: content/ppapi_plugin/ppapi_thread.h

Issue 2545523007: Revert of discardable_memory: Using mojo IPC to replace Chrome IPC (Closed)
Patch Set: Created 4 years 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 | « content/ppapi_plugin/DEPS ('k') | content/ppapi_plugin/ppapi_thread.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 (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
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
43 namespace IPC { 39 namespace IPC {
44 struct ChannelHandle; 40 struct ChannelHandle;
45 } 41 }
46 42
47 namespace content { 43 namespace content {
48 44
49 class PpapiBlinkPlatformImpl; 45 class PpapiBlinkPlatformImpl;
50 46
51 #if defined(COMPILER_MSVC) 47 #if defined(COMPILER_MSVC)
52 // See explanation for other RenderViewHostImpl which is the same issue. 48 // See explanation for other RenderViewHostImpl which is the same issue.
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 // The BlinkPlatformImpl implementation. 174 // The BlinkPlatformImpl implementation.
179 std::unique_ptr<PpapiBlinkPlatformImpl> blink_platform_impl_; 175 std::unique_ptr<PpapiBlinkPlatformImpl> blink_platform_impl_;
180 176
181 #if defined(OS_WIN) 177 #if defined(OS_WIN)
182 // Caches the handle to the peer process if this is a broker. 178 // Caches the handle to the peer process if this is a broker.
183 base::win::ScopedHandle peer_handle_; 179 base::win::ScopedHandle peer_handle_;
184 #endif 180 #endif
185 181
186 variations::ChildProcessFieldTrialSyncer field_trial_syncer_; 182 variations::ChildProcessFieldTrialSyncer field_trial_syncer_;
187 183
188 std::unique_ptr<discardable_memory::ClientDiscardableSharedMemoryManager>
189 discardable_shared_memory_manager_;
190
191 DISALLOW_IMPLICIT_CONSTRUCTORS(PpapiThread); 184 DISALLOW_IMPLICIT_CONSTRUCTORS(PpapiThread);
192 }; 185 };
193 186
194 #if defined(COMPILER_MSVC) 187 #if defined(COMPILER_MSVC)
195 #pragma warning(pop) 188 #pragma warning(pop)
196 #endif 189 #endif
197 190
198 } // namespace content 191 } // namespace content
199 192
200 #endif // CONTENT_PPAPI_PLUGIN_PPAPI_THREAD_H_ 193 #endif // CONTENT_PPAPI_PLUGIN_PPAPI_THREAD_H_
OLDNEW
« no previous file with comments | « content/ppapi_plugin/DEPS ('k') | content/ppapi_plugin/ppapi_thread.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698