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 | 357 |
358 void AwContentBrowserClient::AllowCertificateError( | 358 void AwContentBrowserClient::AllowCertificateError( |
359 int render_process_id, | 359 int render_process_id, |
360 int render_frame_id, | 360 int render_frame_id, |
361 int cert_error, | 361 int cert_error, |
362 const net::SSLInfo& ssl_info, | 362 const net::SSLInfo& ssl_info, |
363 const GURL& request_url, | 363 const GURL& request_url, |
364 ResourceType resource_type, | 364 ResourceType resource_type, |
365 bool overridable, | 365 bool overridable, |
366 bool strict_enforcement, | 366 bool strict_enforcement, |
| 367 bool expired_previous_decision, |
367 const base::Callback<void(bool)>& callback, | 368 const base::Callback<void(bool)>& callback, |
368 content::CertificateRequestResultType* result) { | 369 content::CertificateRequestResultType* result) { |
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 bool cancel_request = true; | 372 bool cancel_request = true; |
372 if (client) | 373 if (client) |
373 client->AllowCertificateError(cert_error, | 374 client->AllowCertificateError(cert_error, |
374 ssl_info.cert.get(), | 375 ssl_info.cert.get(), |
375 request_url, | 376 request_url, |
376 callback, | 377 callback, |
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
588 | 589 |
589 #if defined(VIDEO_HOLE) | 590 #if defined(VIDEO_HOLE) |
590 content::ExternalVideoSurfaceContainer* | 591 content::ExternalVideoSurfaceContainer* |
591 AwContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer( | 592 AwContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer( |
592 content::WebContents* web_contents) { | 593 content::WebContents* web_contents) { |
593 return native_factory_->CreateExternalVideoSurfaceContainer(web_contents); | 594 return native_factory_->CreateExternalVideoSurfaceContainer(web_contents); |
594 } | 595 } |
595 #endif | 596 #endif |
596 | 597 |
597 } // namespace android_webview | 598 } // namespace android_webview |
OLD | NEW |