Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2088)

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: Fix Android builds Created 5 years, 11 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ssl/ssl_blocking_page.h ('k') | chrome/browser/ssl/ssl_error_classification.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 944dae4b3b88cb8f5f4a15b655217cd74524cc4a..1f70870eec29ececf3ac13cf8c8fe8fd1bb5338d 100644
--- a/chrome/browser/ssl/ssl_blocking_page.cc
+++ b/chrome/browser/ssl/ssl_blocking_page.cc
@@ -331,8 +331,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_(IsOptionsOverridable(options_mask)),
danger_overridable_(true),
strict_enforcement_((options_mask & STRICT_ENFORCEMENT) != 0),
internal_(false),
@@ -721,6 +720,12 @@ void SSLBlockingPage::SetExtraInfo(
}
}
+// static
+bool SSLBlockingPage::IsOptionsOverridable(int options_mask) {
+ return (options_mask & SSLBlockingPage::OVERRIDABLE) &&
+ !(options_mask & SSLBlockingPage::STRICT_ENFORCEMENT);
+}
+
void SSLBlockingPage::OnGotHistoryCount(bool success,
int num_visits,
base::Time first_visit) {
« no previous file with comments | « chrome/browser/ssl/ssl_blocking_page.h ('k') | chrome/browser/ssl/ssl_error_classification.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698