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 CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ | 5 #ifndef CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ |
6 #define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ | 6 #define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ |
7 | 7 |
8 #include <set> | 8 #include <set> |
9 #include <string> | 9 #include <string> |
10 #include <utility> | 10 #include <utility> |
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
156 int render_process_id, | 156 int render_process_id, |
157 int render_view_id, | 157 int render_view_id, |
158 int cert_error, | 158 int cert_error, |
159 const net::SSLInfo& ssl_info, | 159 const net::SSLInfo& ssl_info, |
160 const GURL& request_url, | 160 const GURL& request_url, |
161 ResourceType::Type resource_type, | 161 ResourceType::Type resource_type, |
162 bool overridable, | 162 bool overridable, |
163 bool strict_enforcement, | 163 bool strict_enforcement, |
164 const base::Callback<void(bool)>& callback, | 164 const base::Callback<void(bool)>& callback, |
165 content::CertificateRequestResultType* request) OVERRIDE; | 165 content::CertificateRequestResultType* request) OVERRIDE; |
| 166 virtual scoped_ptr<net::ClientCertStore> GetClientCertStore( |
| 167 content::ResourceContext* context) OVERRIDE; |
166 virtual void SelectClientCertificate( | 168 virtual void SelectClientCertificate( |
167 int render_process_id, | 169 int render_process_id, |
168 int render_view_id, | 170 int render_view_id, |
169 const net::HttpNetworkSession* network_session, | 171 const net::HttpNetworkSession* network_session, |
170 net::SSLCertRequestInfo* cert_request_info, | 172 net::SSLCertRequestInfo* cert_request_info, |
171 const base::Callback<void(net::X509Certificate*)>& callback) OVERRIDE; | 173 const base::Callback<void(net::X509Certificate*)>& callback) OVERRIDE; |
172 virtual void AddCertificate( | 174 virtual void AddCertificate( |
173 net::URLRequest* request, | 175 net::URLRequest* request, |
174 net::CertificateMimeType cert_type, | 176 net::CertificateMimeType cert_type, |
175 const void* cert_data, | 177 const void* cert_data, |
176 size_t cert_size, | 178 size_t cert_size, |
177 int render_process_id, | 179 int render_process_id, |
178 int render_view_id) OVERRIDE; | 180 int render_view_id) OVERRIDE; |
| 181 virtual void GenerateKey( |
| 182 content::ResourceContext* context, |
| 183 int key_size_in_bits, |
| 184 const std::string& challenge, |
| 185 const GURL& url, |
| 186 const base::Callback<void(const std::string*)>& callback) OVERRIDE; |
179 virtual content::MediaObserver* GetMediaObserver() OVERRIDE; | 187 virtual content::MediaObserver* GetMediaObserver() OVERRIDE; |
180 virtual void RequestDesktopNotificationPermission( | 188 virtual void RequestDesktopNotificationPermission( |
181 const GURL& source_origin, | 189 const GURL& source_origin, |
182 int callback_context, | 190 int callback_context, |
183 int render_process_id, | 191 int render_process_id, |
184 int render_view_id) OVERRIDE; | 192 int render_view_id) OVERRIDE; |
185 virtual WebKit::WebNotificationPresenter::Permission | 193 virtual WebKit::WebNotificationPresenter::Permission |
186 CheckDesktopNotificationPermission( | 194 CheckDesktopNotificationPermission( |
187 const GURL& source_origin, | 195 const GURL& source_origin, |
188 content::ResourceContext* context, | 196 content::ResourceContext* context, |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
255 virtual void GetAdditionalMappedFilesForChildProcess( | 263 virtual void GetAdditionalMappedFilesForChildProcess( |
256 const CommandLine& command_line, | 264 const CommandLine& command_line, |
257 int child_process_id, | 265 int child_process_id, |
258 std::vector<content::FileDescriptorInfo>* mappings) OVERRIDE; | 266 std::vector<content::FileDescriptorInfo>* mappings) OVERRIDE; |
259 #endif | 267 #endif |
260 #if defined(OS_WIN) | 268 #if defined(OS_WIN) |
261 virtual const wchar_t* GetResourceDllName() OVERRIDE; | 269 virtual const wchar_t* GetResourceDllName() OVERRIDE; |
262 virtual void PreSpawnRenderer(sandbox::TargetPolicy* policy, | 270 virtual void PreSpawnRenderer(sandbox::TargetPolicy* policy, |
263 bool* success) OVERRIDE; | 271 bool* success) OVERRIDE; |
264 #endif | 272 #endif |
265 #if defined(USE_NSS) | |
266 virtual | |
267 crypto::CryptoModuleBlockingPasswordDelegate* GetCryptoPasswordDelegate( | |
268 const GURL& url) OVERRIDE; | |
269 #endif | |
270 | 273 |
271 virtual bool IsPluginAllowedToCallRequestOSFileHandle( | 274 virtual bool IsPluginAllowedToCallRequestOSFileHandle( |
272 content::BrowserContext* browser_context, | 275 content::BrowserContext* browser_context, |
273 const GURL& url) OVERRIDE; | 276 const GURL& url) OVERRIDE; |
274 | 277 |
275 private: | 278 private: |
276 #if defined(ENABLE_PLUGINS) | 279 #if defined(ENABLE_PLUGINS) |
277 // Set of origins that can use TCP/UDP private APIs from NaCl. | 280 // Set of origins that can use TCP/UDP private APIs from NaCl. |
278 std::set<std::string> allowed_socket_origins_; | 281 std::set<std::string> allowed_socket_origins_; |
279 // Set of origins that can get a handle for FileIO from NaCl. | 282 // Set of origins that can get a handle for FileIO from NaCl. |
280 std::set<std::string> allowed_file_handle_origins_; | 283 std::set<std::string> allowed_file_handle_origins_; |
281 #endif | 284 #endif |
282 scoped_ptr<extensions::BrowserPermissionsPolicyDelegate> | 285 scoped_ptr<extensions::BrowserPermissionsPolicyDelegate> |
283 permissions_policy_delegate_; | 286 permissions_policy_delegate_; |
284 | 287 |
285 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); | 288 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); |
286 }; | 289 }; |
287 | 290 |
288 } // namespace chrome | 291 } // namespace chrome |
289 | 292 |
290 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ | 293 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ |
OLD | NEW |