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 378 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
389 request_url, | 389 request_url, |
390 callback, | 390 callback, |
391 &cancel_request); | 391 &cancel_request); |
392 if (cancel_request) | 392 if (cancel_request) |
393 callback.Run(content::CERTIFICATE_REQUEST_RESULT_TYPE_DENY); | 393 callback.Run(content::CERTIFICATE_REQUEST_RESULT_TYPE_DENY); |
394 } | 394 } |
395 | 395 |
396 void AwContentBrowserClient::SelectClientCertificate( | 396 void AwContentBrowserClient::SelectClientCertificate( |
397 content::WebContents* web_contents, | 397 content::WebContents* web_contents, |
398 net::SSLCertRequestInfo* cert_request_info, | 398 net::SSLCertRequestInfo* cert_request_info, |
| 399 net::CertificateList client_certs, |
399 std::unique_ptr<content::ClientCertificateDelegate> delegate) { | 400 std::unique_ptr<content::ClientCertificateDelegate> delegate) { |
400 AwContentsClientBridgeBase* client = | 401 AwContentsClientBridgeBase* client = |
401 AwContentsClientBridgeBase::FromWebContents(web_contents); | 402 AwContentsClientBridgeBase::FromWebContents(web_contents); |
402 if (client) | 403 if (client) |
403 client->SelectClientCertificate(cert_request_info, std::move(delegate)); | 404 client->SelectClientCertificate(cert_request_info, std::move(delegate)); |
404 } | 405 } |
405 | 406 |
406 bool AwContentBrowserClient::CanCreateWindow( | 407 bool AwContentBrowserClient::CanCreateWindow( |
407 content::RenderFrameHost* opener, | 408 content::RenderFrameHost* opener, |
408 const GURL& opener_url, | 409 const GURL& opener_url, |
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
559 render_frame_host)); | 560 render_frame_host)); |
560 | 561 |
561 // Although WebView does not support password manager feature, renderer code | 562 // Although WebView does not support password manager feature, renderer code |
562 // could still request this interface, so we register a dummy binder which | 563 // could still request this interface, so we register a dummy binder which |
563 // just drops the incoming request, to avoid the 'Failed to locate a binder | 564 // just drops the incoming request, to avoid the 'Failed to locate a binder |
564 // for interface' error log.. | 565 // for interface' error log.. |
565 registry->AddInterface(base::Bind(&DummyBindPasswordManagerDriver)); | 566 registry->AddInterface(base::Bind(&DummyBindPasswordManagerDriver)); |
566 } | 567 } |
567 | 568 |
568 } // namespace android_webview | 569 } // namespace android_webview |
OLD | NEW |