chrome/browser/chrome_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: chrome/browser/chrome_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: Reverted to no enum in public API 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: chrome/browser/chrome_content_browser_client.cc

diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc

index 5231b91500fef9a3dc1ca9f9f3fca36cde82b484..084ba570fbf8c67520339fb32612c493eca47152 100644

--- a/chrome/browser/chrome_content_browser_client.cc

+++ b/chrome/browser/chrome_content_browser_client.cc

@@ -1712,11 +1712,11 @@ void ChromeContentBrowserClient::AllowCertificateError(

// ownership of ssl_blocking_page.

int options_mask = 0;

if (overridable)

- options_mask = SSLBlockingPage::OVERRIDABLE;

+ options_mask |= SSLBlockingPage::OVERRIDABLE;

if (strict_enforcement)

- options_mask = SSLBlockingPage::STRICT_ENFORCEMENT;

+ options_mask |= SSLBlockingPage::STRICT_ENFORCEMENT;

if (expired_previous_decision)

- options_mask = SSLBlockingPage::EXPIRED_BUT_PREVIOUSLY_ALLOWED;

+ options_mask |= SSLBlockingPage::EXPIRED_BUT_PREVIOUSLY_ALLOWED;

SSLBlockingPage* ssl_blocking_page = new SSLBlockingPage(

tab, cert_error, ssl_info, request_url, options_mask, callback);

ssl_blocking_page->Show();

« no previous file with comments | « no previous file | chrome/browser/ui/webui/interstitials/interstitial_ui.cc » ('j') | no next file with comments »