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

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

Issue 2898573002: Refactor client cert private key handling. (Closed)
Patch Set: fix member order 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 24 matching lines...) Expand all
35 #include "content/shell/browser/shell_net_log.h" 35 #include "content/shell/browser/shell_net_log.h"
36 #include "content/shell/browser/shell_quota_permission_context.h" 36 #include "content/shell/browser/shell_quota_permission_context.h"
37 #include "content/shell/browser/shell_resource_dispatcher_host_delegate.h" 37 #include "content/shell/browser/shell_resource_dispatcher_host_delegate.h"
38 #include "content/shell/browser/shell_web_contents_view_delegate_creator.h" 38 #include "content/shell/browser/shell_web_contents_view_delegate_creator.h"
39 #include "content/shell/common/shell_messages.h" 39 #include "content/shell/common/shell_messages.h"
40 #include "content/shell/common/shell_switches.h" 40 #include "content/shell/common/shell_switches.h"
41 #include "content/shell/grit/shell_resources.h" 41 #include "content/shell/grit/shell_resources.h"
42 #include "content/test/data/mojo_layouttest_test.mojom.h" 42 #include "content/test/data/mojo_layouttest_test.mojom.h"
43 #include "media/mojo/features.h" 43 #include "media/mojo/features.h"
44 #include "mojo/public/cpp/bindings/strong_binding.h" 44 #include "mojo/public/cpp/bindings/strong_binding.h"
45 #include "net/ssl/client_cert_identity.h"
45 #include "net/url_request/url_request_context_getter.h" 46 #include "net/url_request/url_request_context_getter.h"
46 #include "services/service_manager/public/cpp/bind_source_info.h" 47 #include "services/service_manager/public/cpp/bind_source_info.h"
47 #include "storage/browser/quota/quota_settings.h" 48 #include "storage/browser/quota/quota_settings.h"
48 #include "ui/base/resource/resource_bundle.h" 49 #include "ui/base/resource/resource_bundle.h"
49 #include "url/gurl.h" 50 #include "url/gurl.h"
50 #include "url/origin.h" 51 #include "url/origin.h"
51 52
52 #if defined(OS_ANDROID) 53 #if defined(OS_ANDROID)
53 #include "base/android/apk_assets.h" 54 #include "base/android/apk_assets.h"
54 #include "base/android/path_utils.h" 55 #include "base/android/path_utils.h"
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 void ShellContentBrowserClient::GetQuotaSettings( 316 void ShellContentBrowserClient::GetQuotaSettings(
316 BrowserContext* context, 317 BrowserContext* context,
317 StoragePartition* partition, 318 StoragePartition* partition,
318 const storage::OptionalQuotaSettingsCallback& callback) { 319 const storage::OptionalQuotaSettingsCallback& callback) {
319 callback.Run(storage::GetHardCodedSettings(100 * 1024 * 1024)); 320 callback.Run(storage::GetHardCodedSettings(100 * 1024 * 1024));
320 } 321 }
321 322
322 void ShellContentBrowserClient::SelectClientCertificate( 323 void ShellContentBrowserClient::SelectClientCertificate(
323 WebContents* web_contents, 324 WebContents* web_contents,
324 net::SSLCertRequestInfo* cert_request_info, 325 net::SSLCertRequestInfo* cert_request_info,
325 net::CertificateList client_certs, 326 net::ClientCertIdentityList client_certs,
326 std::unique_ptr<ClientCertificateDelegate> delegate) { 327 std::unique_ptr<ClientCertificateDelegate> delegate) {
327 if (!select_client_certificate_callback_.is_null()) 328 if (!select_client_certificate_callback_.is_null())
328 select_client_certificate_callback_.Run(); 329 select_client_certificate_callback_.Run();
329 } 330 }
330 331
331 SpeechRecognitionManagerDelegate* 332 SpeechRecognitionManagerDelegate*
332 ShellContentBrowserClient::CreateSpeechRecognitionManagerDelegate() { 333 ShellContentBrowserClient::CreateSpeechRecognitionManagerDelegate() {
333 return new ShellSpeechRecognitionManagerDelegate(); 334 return new ShellSpeechRecognitionManagerDelegate();
334 } 335 }
335 336
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 ShellBrowserContext* ShellContentBrowserClient::browser_context() { 402 ShellBrowserContext* ShellContentBrowserClient::browser_context() {
402 return shell_browser_main_parts_->browser_context(); 403 return shell_browser_main_parts_->browser_context();
403 } 404 }
404 405
405 ShellBrowserContext* 406 ShellBrowserContext*
406 ShellContentBrowserClient::off_the_record_browser_context() { 407 ShellContentBrowserClient::off_the_record_browser_context() {
407 return shell_browser_main_parts_->off_the_record_browser_context(); 408 return shell_browser_main_parts_->off_the_record_browser_context();
408 } 409 }
409 410
410 } // namespace content 411 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698