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

Side by Side Diff: android_webview/browser/aw_content_browser_client.cc

Issue 2848313003: Revert of Remove client_certs from SSLCertRequestInfo. (Closed)
Patch Set: Created 3 years, 7 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 (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
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,
400 std::unique_ptr<content::ClientCertificateDelegate> delegate) { 399 std::unique_ptr<content::ClientCertificateDelegate> delegate) {
401 AwContentsClientBridgeBase* client = 400 AwContentsClientBridgeBase* client =
402 AwContentsClientBridgeBase::FromWebContents(web_contents); 401 AwContentsClientBridgeBase::FromWebContents(web_contents);
403 if (client) 402 if (client)
404 client->SelectClientCertificate(cert_request_info, std::move(delegate)); 403 client->SelectClientCertificate(cert_request_info, std::move(delegate));
405 } 404 }
406 405
407 bool AwContentBrowserClient::CanCreateWindow( 406 bool AwContentBrowserClient::CanCreateWindow(
408 content::RenderFrameHost* opener, 407 content::RenderFrameHost* opener,
409 const GURL& opener_url, 408 const GURL& opener_url,
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
560 render_frame_host)); 559 render_frame_host));
561 560
562 // Although WebView does not support password manager feature, renderer code 561 // Although WebView does not support password manager feature, renderer code
563 // could still request this interface, so we register a dummy binder which 562 // could still request this interface, so we register a dummy binder which
564 // just drops the incoming request, to avoid the 'Failed to locate a binder 563 // just drops the incoming request, to avoid the 'Failed to locate a binder
565 // for interface' error log.. 564 // for interface' error log..
566 registry->AddInterface(base::Bind(&DummyBindPasswordManagerDriver)); 565 registry->AddInterface(base::Bind(&DummyBindPasswordManagerDriver));
567 } 566 }
568 567
569 } // namespace android_webview 568 } // namespace android_webview
OLDNEW
« no previous file with comments | « android_webview/browser/aw_content_browser_client.h ('k') | chrome/browser/chrome_content_browser_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698