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 "android_webview/browser/aw_browser_context.h" | 7 #include "android_webview/browser/aw_browser_context.h" |
8 #include "android_webview/browser/aw_browser_main_parts.h" | 8 #include "android_webview/browser/aw_browser_main_parts.h" |
9 #include "android_webview/browser/aw_browser_permission_request_delegate.h" | 9 #include "android_webview/browser/aw_browser_permission_request_delegate.h" |
10 #include "android_webview/browser/aw_contents_client_bridge_base.h" | 10 #include "android_webview/browser/aw_contents_client_bridge_base.h" |
(...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
367 request_url, | 367 request_url, |
368 callback, | 368 callback, |
369 &cancel_request); | 369 &cancel_request); |
370 if (cancel_request) | 370 if (cancel_request) |
371 *result = content::CERTIFICATE_REQUEST_RESULT_TYPE_DENY; | 371 *result = content::CERTIFICATE_REQUEST_RESULT_TYPE_DENY; |
372 } | 372 } |
373 | 373 |
374 void AwContentBrowserClient::SelectClientCertificate( | 374 void AwContentBrowserClient::SelectClientCertificate( |
375 int render_process_id, | 375 int render_process_id, |
376 int render_frame_id, | 376 int render_frame_id, |
| 377 const net::HttpNetworkSession* network_session, |
377 net::SSLCertRequestInfo* cert_request_info, | 378 net::SSLCertRequestInfo* cert_request_info, |
378 const base::Callback<void(net::X509Certificate*)>& callback) { | 379 const base::Callback<void(net::X509Certificate*)>& callback) { |
379 AwContentsClientBridgeBase* client = | 380 AwContentsClientBridgeBase* client = |
380 AwContentsClientBridgeBase::FromID(render_process_id, render_frame_id); | 381 AwContentsClientBridgeBase::FromID(render_process_id, render_frame_id); |
381 if (client) { | 382 if (client) { |
382 client->SelectClientCertificate(cert_request_info, callback); | 383 client->SelectClientCertificate(cert_request_info, callback); |
383 } else { | 384 } else { |
384 callback.Run(NULL); | 385 callback.Run(NULL); |
385 } | 386 } |
386 } | 387 } |
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
575 return native_factory_->CreateExternalVideoSurfaceContainer(web_contents); | 576 return native_factory_->CreateExternalVideoSurfaceContainer(web_contents); |
576 } | 577 } |
577 #endif | 578 #endif |
578 | 579 |
579 content::DevToolsManagerDelegate* | 580 content::DevToolsManagerDelegate* |
580 AwContentBrowserClient::GetDevToolsManagerDelegate() { | 581 AwContentBrowserClient::GetDevToolsManagerDelegate() { |
581 return new AwDevToolsManagerDelegate(); | 582 return new AwDevToolsManagerDelegate(); |
582 } | 583 } |
583 | 584 |
584 } // namespace android_webview | 585 } // namespace android_webview |
OLD | NEW |