OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 #include "content/shell/browser/shell_content_browser_client.h" | 5 #include "content/shell/browser/shell_content_browser_client.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/base_switches.h" | 10 #include "base/base_switches.h" |
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
295 void ShellContentBrowserClient::GetQuotaSettings( | 295 void ShellContentBrowserClient::GetQuotaSettings( |
296 BrowserContext* context, | 296 BrowserContext* context, |
297 StoragePartition* partition, | 297 StoragePartition* partition, |
298 const storage::OptionalQuotaSettingsCallback& callback) { | 298 const storage::OptionalQuotaSettingsCallback& callback) { |
299 callback.Run(storage::GetHardCodedSettings(100 * 1024 * 1024)); | 299 callback.Run(storage::GetHardCodedSettings(100 * 1024 * 1024)); |
300 } | 300 } |
301 | 301 |
302 void ShellContentBrowserClient::SelectClientCertificate( | 302 void ShellContentBrowserClient::SelectClientCertificate( |
303 WebContents* web_contents, | 303 WebContents* web_contents, |
304 net::SSLCertRequestInfo* cert_request_info, | 304 net::SSLCertRequestInfo* cert_request_info, |
| 305 net::CertificateList client_certs, |
305 std::unique_ptr<ClientCertificateDelegate> delegate) { | 306 std::unique_ptr<ClientCertificateDelegate> delegate) { |
306 if (!select_client_certificate_callback_.is_null()) | 307 if (!select_client_certificate_callback_.is_null()) |
307 select_client_certificate_callback_.Run(); | 308 select_client_certificate_callback_.Run(); |
308 } | 309 } |
309 | 310 |
310 SpeechRecognitionManagerDelegate* | 311 SpeechRecognitionManagerDelegate* |
311 ShellContentBrowserClient::CreateSpeechRecognitionManagerDelegate() { | 312 ShellContentBrowserClient::CreateSpeechRecognitionManagerDelegate() { |
312 return new ShellSpeechRecognitionManagerDelegate(); | 313 return new ShellSpeechRecognitionManagerDelegate(); |
313 } | 314 } |
314 | 315 |
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
380 ShellBrowserContext* ShellContentBrowserClient::browser_context() { | 381 ShellBrowserContext* ShellContentBrowserClient::browser_context() { |
381 return shell_browser_main_parts_->browser_context(); | 382 return shell_browser_main_parts_->browser_context(); |
382 } | 383 } |
383 | 384 |
384 ShellBrowserContext* | 385 ShellBrowserContext* |
385 ShellContentBrowserClient::off_the_record_browser_context() { | 386 ShellContentBrowserClient::off_the_record_browser_context() { |
386 return shell_browser_main_parts_->off_the_record_browser_context(); | 387 return shell_browser_main_parts_->off_the_record_browser_context(); |
387 } | 388 } |
388 | 389 |
389 } // namespace content | 390 } // namespace content |
OLD | NEW |