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

Side by Side Diff: content/shell/browser/shell_content_browser_client.cc

Issue 2898573002: Refactor client cert private key handling. (Closed)
Patch Set: rebase on https://codereview.chromium.org/2899083006/ Created 3 years, 6 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 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 21 matching lines...) Expand all
32 #include "content/shell/browser/shell_browser_main_parts.h" 32 #include "content/shell/browser/shell_browser_main_parts.h"
33 #include "content/shell/browser/shell_devtools_manager_delegate.h" 33 #include "content/shell/browser/shell_devtools_manager_delegate.h"
34 #include "content/shell/browser/shell_net_log.h" 34 #include "content/shell/browser/shell_net_log.h"
35 #include "content/shell/browser/shell_quota_permission_context.h" 35 #include "content/shell/browser/shell_quota_permission_context.h"
36 #include "content/shell/browser/shell_resource_dispatcher_host_delegate.h" 36 #include "content/shell/browser/shell_resource_dispatcher_host_delegate.h"
37 #include "content/shell/browser/shell_web_contents_view_delegate_creator.h" 37 #include "content/shell/browser/shell_web_contents_view_delegate_creator.h"
38 #include "content/shell/common/shell_messages.h" 38 #include "content/shell/common/shell_messages.h"
39 #include "content/shell/common/shell_switches.h" 39 #include "content/shell/common/shell_switches.h"
40 #include "content/shell/grit/shell_resources.h" 40 #include "content/shell/grit/shell_resources.h"
41 #include "media/mojo/features.h" 41 #include "media/mojo/features.h"
42 #include "net/ssl/client_cert_identity.h"
42 #include "net/url_request/url_request_context_getter.h" 43 #include "net/url_request/url_request_context_getter.h"
43 #include "storage/browser/quota/quota_settings.h" 44 #include "storage/browser/quota/quota_settings.h"
44 #include "ui/base/resource/resource_bundle.h" 45 #include "ui/base/resource/resource_bundle.h"
45 #include "url/gurl.h" 46 #include "url/gurl.h"
46 #include "url/origin.h" 47 #include "url/origin.h"
47 48
48 #if defined(OS_ANDROID) 49 #if defined(OS_ANDROID)
49 #include "base/android/apk_assets.h" 50 #include "base/android/apk_assets.h"
50 #include "base/android/path_utils.h" 51 #include "base/android/path_utils.h"
51 #include "components/crash/content/browser/crash_dump_manager_android.h" 52 #include "components/crash/content/browser/crash_dump_manager_android.h"
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
296 void ShellContentBrowserClient::GetQuotaSettings( 297 void ShellContentBrowserClient::GetQuotaSettings(
297 BrowserContext* context, 298 BrowserContext* context,
298 StoragePartition* partition, 299 StoragePartition* partition,
299 const storage::OptionalQuotaSettingsCallback& callback) { 300 const storage::OptionalQuotaSettingsCallback& callback) {
300 callback.Run(storage::GetHardCodedSettings(100 * 1024 * 1024)); 301 callback.Run(storage::GetHardCodedSettings(100 * 1024 * 1024));
301 } 302 }
302 303
303 void ShellContentBrowserClient::SelectClientCertificate( 304 void ShellContentBrowserClient::SelectClientCertificate(
304 WebContents* web_contents, 305 WebContents* web_contents,
305 net::SSLCertRequestInfo* cert_request_info, 306 net::SSLCertRequestInfo* cert_request_info,
306 net::CertificateList client_certs, 307 net::ClientCertIdentityList client_certs,
307 std::unique_ptr<ClientCertificateDelegate> delegate) { 308 std::unique_ptr<ClientCertificateDelegate> delegate) {
308 if (!select_client_certificate_callback_.is_null()) 309 if (!select_client_certificate_callback_.is_null())
309 select_client_certificate_callback_.Run(); 310 select_client_certificate_callback_.Run();
310 } 311 }
311 312
312 SpeechRecognitionManagerDelegate* 313 SpeechRecognitionManagerDelegate*
313 ShellContentBrowserClient::CreateSpeechRecognitionManagerDelegate() { 314 ShellContentBrowserClient::CreateSpeechRecognitionManagerDelegate() {
314 return new ShellSpeechRecognitionManagerDelegate(); 315 return new ShellSpeechRecognitionManagerDelegate();
315 } 316 }
316 317
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
382 ShellBrowserContext* ShellContentBrowserClient::browser_context() { 383 ShellBrowserContext* ShellContentBrowserClient::browser_context() {
383 return shell_browser_main_parts_->browser_context(); 384 return shell_browser_main_parts_->browser_context();
384 } 385 }
385 386
386 ShellBrowserContext* 387 ShellBrowserContext*
387 ShellContentBrowserClient::off_the_record_browser_context() { 388 ShellContentBrowserClient::off_the_record_browser_context() {
388 return shell_browser_main_parts_->off_the_record_browser_context(); 389 return shell_browser_main_parts_->off_the_record_browser_context();
389 } 390 }
390 391
391 } // namespace content 392 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/browser/shell_content_browser_client.h ('k') | crypto/nss_crypto_module_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698