| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "chromecast/browser/cast_content_browser_client.h" | 5 #include "chromecast/browser/cast_content_browser_client.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <string> | 9 #include <string> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 319 | 319 |
| 320 void CastContentBrowserClient::AllowCertificateError( | 320 void CastContentBrowserClient::AllowCertificateError( |
| 321 content::WebContents* web_contents, | 321 content::WebContents* web_contents, |
| 322 int cert_error, | 322 int cert_error, |
| 323 const net::SSLInfo& ssl_info, | 323 const net::SSLInfo& ssl_info, |
| 324 const GURL& request_url, | 324 const GURL& request_url, |
| 325 content::ResourceType resource_type, | 325 content::ResourceType resource_type, |
| 326 bool overridable, | 326 bool overridable, |
| 327 bool strict_enforcement, | 327 bool strict_enforcement, |
| 328 bool expired_previous_decision, | 328 bool expired_previous_decision, |
| 329 const base::Callback<void(bool)>& callback, | 329 const base::Callback<void(content::CertificateRequestResultType)>& |
| 330 content::CertificateRequestResultType* result) { | 330 callback) { |
| 331 // Allow developers to override certificate errors. | 331 // Allow developers to override certificate errors. |
| 332 // Otherwise, any fatal certificate errors will cause an abort. | 332 // Otherwise, any fatal certificate errors will cause an abort. |
| 333 *result = content::CERTIFICATE_REQUEST_RESULT_TYPE_CANCEL; | 333 if (!callback.is_null()) { |
| 334 callback.Run(content::CERTIFICATE_REQUEST_RESULT_TYPE_CANCEL); |
| 335 } |
| 334 return; | 336 return; |
| 335 } | 337 } |
| 336 | 338 |
| 337 void CastContentBrowserClient::SelectClientCertificate( | 339 void CastContentBrowserClient::SelectClientCertificate( |
| 338 content::WebContents* web_contents, | 340 content::WebContents* web_contents, |
| 339 net::SSLCertRequestInfo* cert_request_info, | 341 net::SSLCertRequestInfo* cert_request_info, |
| 340 std::unique_ptr<content::ClientCertificateDelegate> delegate) { | 342 std::unique_ptr<content::ClientCertificateDelegate> delegate) { |
| 341 GURL requesting_url("https://" + cert_request_info->host_and_port.ToString()); | 343 GURL requesting_url("https://" + cert_request_info->host_and_port.ToString()); |
| 342 | 344 |
| 343 if (!requesting_url.is_valid()) { | 345 if (!requesting_url.is_valid()) { |
| (...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 531 process_type, dumps_path, false /* upload */); | 533 process_type, dumps_path, false /* upload */); |
| 532 // StartUploaderThread() even though upload is diferred. | 534 // StartUploaderThread() even though upload is diferred. |
| 533 // Breakpad-related memory is freed in the uploader thread. | 535 // Breakpad-related memory is freed in the uploader thread. |
| 534 crash_handler->StartUploaderThread(); | 536 crash_handler->StartUploaderThread(); |
| 535 return crash_handler; | 537 return crash_handler; |
| 536 } | 538 } |
| 537 #endif // !defined(OS_ANDROID) | 539 #endif // !defined(OS_ANDROID) |
| 538 | 540 |
| 539 } // namespace shell | 541 } // namespace shell |
| 540 } // namespace chromecast | 542 } // namespace chromecast |
| OLD | NEW |