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

Side by Side Diff: content/browser/renderer_host/pepper/browser_ppapi_host_impl.h

Issue 1099383002: Change ScopedPtrHashMap's 2nd template parameter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 7 months 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
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_BROWSER_RENDERER_HOST_PEPPER_BROWSER_PPAPI_HOST_IMPL_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_PEPPER_BROWSER_PPAPI_HOST_IMPL_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_PEPPER_BROWSER_PPAPI_HOST_IMPL_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_PEPPER_BROWSER_PPAPI_HOST_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 // If true, this refers to a plugin running in the renderer process. 148 // If true, this refers to a plugin running in the renderer process.
149 bool in_process_; 149 bool in_process_;
150 150
151 // If true, this is an external plugin, i.e. created by the embedder using 151 // If true, this is an external plugin, i.e. created by the embedder using
152 // BrowserPpapiHost::CreateExternalPluginProcess. 152 // BrowserPpapiHost::CreateExternalPluginProcess.
153 bool external_plugin_; 153 bool external_plugin_;
154 154
155 scoped_refptr<SSLContextHelper> ssl_context_helper_; 155 scoped_refptr<SSLContextHelper> ssl_context_helper_;
156 156
157 // Tracks all PP_Instances in this plugin and associated data. 157 // Tracks all PP_Instances in this plugin and associated data.
158 base::ScopedPtrHashMap<PP_Instance, InstanceData> instance_map_; 158 base::ScopedPtrHashMap<PP_Instance, scoped_ptr<InstanceData>> instance_map_;
159 159
160 scoped_refptr<HostMessageFilter> message_filter_; 160 scoped_refptr<HostMessageFilter> message_filter_;
161 161
162 BrowserPpapiHost::OnKeepaliveCallback on_keepalive_callback_; 162 BrowserPpapiHost::OnKeepaliveCallback on_keepalive_callback_;
163 163
164 DISALLOW_COPY_AND_ASSIGN(BrowserPpapiHostImpl); 164 DISALLOW_COPY_AND_ASSIGN(BrowserPpapiHostImpl);
165 }; 165 };
166 166
167 } // namespace content 167 } // namespace content
168 168
169 #endif // CONTENT_BROWSER_RENDERER_HOST_PEPPER_BROWSER_PPAPI_HOST_IMPL_H_ 169 #endif // CONTENT_BROWSER_RENDERER_HOST_PEPPER_BROWSER_PPAPI_HOST_IMPL_H_
OLDNEW
« no previous file with comments | « content/browser/media/media_web_contents_observer.h ('k') | content/browser/service_worker/service_worker_context_watcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698