Chromium Code Reviews| 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 #include "android_webview/browser/aw_content_browser_client.h" | 5 #include "android_webview/browser/aw_content_browser_client.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "android_webview/browser/aw_browser_context.h" | 9 #include "android_webview/browser/aw_browser_context.h" |
| 10 #include "android_webview/browser/aw_browser_main_parts.h" | 10 #include "android_webview/browser/aw_browser_main_parts.h" |
| (...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 345 | 345 |
| 346 void AwContentBrowserClient::AllowCertificateError( | 346 void AwContentBrowserClient::AllowCertificateError( |
| 347 content::WebContents* web_contents, | 347 content::WebContents* web_contents, |
| 348 int cert_error, | 348 int cert_error, |
| 349 const net::SSLInfo& ssl_info, | 349 const net::SSLInfo& ssl_info, |
| 350 const GURL& request_url, | 350 const GURL& request_url, |
| 351 ResourceType resource_type, | 351 ResourceType resource_type, |
| 352 bool overridable, | 352 bool overridable, |
| 353 bool strict_enforcement, | 353 bool strict_enforcement, |
| 354 bool expired_previous_decision, | 354 bool expired_previous_decision, |
| 355 const base::Callback<void(bool)>& callback, | 355 const base::Callback<void(content::CertificateRequestResultType)>& |
| 356 content::CertificateRequestResultType* result) { | 356 callback) { |
| 357 AwContentsClientBridgeBase* client = | 357 AwContentsClientBridgeBase* client = |
| 358 AwContentsClientBridgeBase::FromWebContents(web_contents); | 358 AwContentsClientBridgeBase::FromWebContents(web_contents); |
| 359 bool cancel_request = true; | 359 bool cancel_request = true; |
| 360 if (client) | 360 if (client) |
| 361 client->AllowCertificateError(cert_error, | 361 client->AllowCertificateError(cert_error, |
| 362 ssl_info.cert.get(), | 362 ssl_info.cert.get(), |
| 363 request_url, | 363 request_url, |
| 364 callback, | 364 callback, |
| 365 &cancel_request); | 365 &cancel_request); |
| 366 if (cancel_request) | 366 if (cancel_request) { |
|
nasko
2016/08/08 18:32:03
nit: No need for {} on one-line if statements.
estark
2016/08/08 20:00:13
Done.
| |
| 367 *result = content::CERTIFICATE_REQUEST_RESULT_TYPE_DENY; | 367 callback.Run(content::CERTIFICATE_REQUEST_RESULT_TYPE_DENY); |
| 368 } | |
| 368 } | 369 } |
| 369 | 370 |
| 370 void AwContentBrowserClient::SelectClientCertificate( | 371 void AwContentBrowserClient::SelectClientCertificate( |
| 371 content::WebContents* web_contents, | 372 content::WebContents* web_contents, |
| 372 net::SSLCertRequestInfo* cert_request_info, | 373 net::SSLCertRequestInfo* cert_request_info, |
| 373 std::unique_ptr<content::ClientCertificateDelegate> delegate) { | 374 std::unique_ptr<content::ClientCertificateDelegate> delegate) { |
| 374 AwContentsClientBridgeBase* client = | 375 AwContentsClientBridgeBase* client = |
| 375 AwContentsClientBridgeBase::FromWebContents(web_contents); | 376 AwContentsClientBridgeBase::FromWebContents(web_contents); |
| 376 if (client) | 377 if (client) |
| 377 client->SelectClientCertificate(cert_request_info, std::move(delegate)); | 378 client->SelectClientCertificate(cert_request_info, std::move(delegate)); |
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 512 | 513 |
| 513 #if defined(VIDEO_HOLE) | 514 #if defined(VIDEO_HOLE) |
| 514 content::ExternalVideoSurfaceContainer* | 515 content::ExternalVideoSurfaceContainer* |
| 515 AwContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer( | 516 AwContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer( |
| 516 content::WebContents* web_contents) { | 517 content::WebContents* web_contents) { |
| 517 return native_factory_->CreateExternalVideoSurfaceContainer(web_contents); | 518 return native_factory_->CreateExternalVideoSurfaceContainer(web_contents); |
| 518 } | 519 } |
| 519 #endif | 520 #endif |
| 520 | 521 |
| 521 } // namespace android_webview | 522 } // namespace android_webview |
| OLD | NEW |