android_webview/browser/aw_content_browser_client.cc - Issue 578373002: Interstitial options are not OR'd properly.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: android_webview/browser/aw_content_browser_client.cc

Issue 578373002: Interstitial options are not OR'd properly. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master

Patch Set: Changed API to pass options_mask through Created 6 years, 3 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:

Index: android_webview/browser/aw_content_browser_client.cc

diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webview/browser/aw_content_browser_client.cc

index 4b1ee6f7c8f5ee7faeaf7a019c6eec56b9d5da73..75b99f5d3de26de91100240036fb27c71d0cbda6 100644

--- a/android_webview/browser/aw_content_browser_client.cc

+++ b/android_webview/browser/aw_content_browser_client.cc

@@ -363,9 +363,7 @@ void AwContentBrowserClient::AllowCertificateError(

const net::SSLInfo& ssl_info,

const GURL& request_url,

ResourceType resource_type,

- bool overridable,

- bool strict_enforcement,

- bool expired_previous_decision,

+ int options_mask,

const base::Callback<void(bool)>& callback,

content::CertificateRequestResultType* result) {

AwContentsClientBridgeBase* client =