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 346 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
357 request_url, | 357 request_url, |
358 callback, | 358 callback, |
359 &cancel_request); | 359 &cancel_request); |
360 if (cancel_request) | 360 if (cancel_request) |
361 *result = content::CERTIFICATE_REQUEST_RESULT_TYPE_DENY; | 361 *result = content::CERTIFICATE_REQUEST_RESULT_TYPE_DENY; |
362 } | 362 } |
363 | 363 |
364 void AwContentBrowserClient::SelectClientCertificate( | 364 void AwContentBrowserClient::SelectClientCertificate( |
365 int render_process_id, | 365 int render_process_id, |
366 int render_frame_id, | 366 int render_frame_id, |
| 367 const net::HttpNetworkSession* network_session, |
367 net::SSLCertRequestInfo* cert_request_info, | 368 net::SSLCertRequestInfo* cert_request_info, |
368 const base::Callback<void(net::X509Certificate*)>& callback) { | 369 const base::Callback<void(net::X509Certificate*)>& callback) { |
369 AwContentsClientBridgeBase* client = | 370 AwContentsClientBridgeBase* client = |
370 AwContentsClientBridgeBase::FromID(render_process_id, render_frame_id); | 371 AwContentsClientBridgeBase::FromID(render_process_id, render_frame_id); |
371 if (client) { | 372 if (client) { |
372 client->SelectClientCertificate(cert_request_info, callback); | 373 client->SelectClientCertificate(cert_request_info, callback); |
373 } else { | 374 } else { |
374 callback.Run(NULL); | 375 callback.Run(NULL); |
375 } | 376 } |
376 } | 377 } |
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
551 return native_factory_->CreateExternalVideoSurfaceContainer(web_contents); | 552 return native_factory_->CreateExternalVideoSurfaceContainer(web_contents); |
552 } | 553 } |
553 #endif | 554 #endif |
554 | 555 |
555 content::DevToolsManagerDelegate* | 556 content::DevToolsManagerDelegate* |
556 AwContentBrowserClient::GetDevToolsManagerDelegate() { | 557 AwContentBrowserClient::GetDevToolsManagerDelegate() { |
557 return new AwDevToolsManagerDelegate(); | 558 return new AwDevToolsManagerDelegate(); |
558 } | 559 } |
559 | 560 |
560 } // namespace android_webview | 561 } // namespace android_webview |
OLD | NEW |