chrome/browser/ssl/ssl_blocking_page.cc - Issue 318213002: Add custom interstitial for captive portals.

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/ssl/ssl_blocking_page.cc

Issue 318213002: Add custom interstitial for captive portals. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Stop the timer at the right place Created 6 years, 1 month 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/ssl/ssl_blocking_page.cc

diff --git a/chrome/browser/ssl/ssl_blocking_page.cc b/chrome/browser/ssl/ssl_blocking_page.cc

index bd5ca8a449aac8fdbefa21788a5d5881c8299b42..aa7f23a8794180b9baa2ea8a6c212f2fb3852686 100644

--- a/chrome/browser/ssl/ssl_blocking_page.cc

+++ b/chrome/browser/ssl/ssl_blocking_page.cc

@@ -313,8 +313,7 @@ SSLBlockingPage::SSLBlockingPage(content::WebContents* web_contents,

callback_(callback),

cert_error_(cert_error),

ssl_info_(ssl_info),

- overridable_(options_mask & OVERRIDABLE &&

- !(options_mask & STRICT_ENFORCEMENT)),

+ overridable_(IsOverridable(options_mask)),

strict_enforcement_((options_mask & STRICT_ENFORCEMENT) != 0),

internal_(false),

num_visits_(-1),