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

Unified Diff: chrome/browser/resources/security_warnings/interstitial_v2.js

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/resources/security_warnings/interstitial_v2.html ('k') | chrome/browser/ssl/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/security_warnings/interstitial_v2.js
diff --git a/chrome/browser/resources/security_warnings/interstitial_v2.js b/chrome/browser/resources/security_warnings/interstitial_v2.js
index e3ac1b065eed9294686c452c6d7c7195063588e7..e9a846ad6b0a91bc70831b0d04f5d960e0e1cd14 100644
--- a/chrome/browser/resources/security_warnings/interstitial_v2.js
+++ b/chrome/browser/resources/security_warnings/interstitial_v2.js
@@ -65,7 +65,9 @@ function toggleDebuggingInfo() {
function setupEvents() {
var overridable = loadTimeData.getBoolean('overridable');
- var ssl = loadTimeData.getString('type') === 'SSL';
+ var interstitialType = loadTimeData.getString('type');
+ var ssl = interstitialType == 'SSL';
+ var captivePortal = interstitialType == 'CAPTIVE_PORTAL';
var badClock = ssl && loadTimeData.getBoolean('bad_clock');
var hidePrimaryButton = badClock && loadTimeData.getBoolean(
'hide_primary_button');
@@ -74,6 +76,8 @@ function setupEvents() {
$('body').classList.add(badClock ? 'bad-clock' : 'ssl');
$('error-code').textContent = loadTimeData.getString('errorCode');
$('error-code').classList.remove('hidden');
+ } else if (captivePortal) {
+ $('body').classList.add('captive-portal');
} else {
$('body').classList.add('safe-browsing');
}
@@ -82,18 +86,32 @@ function setupEvents() {
$('primary-button').classList.add('hidden');
} else {
$('primary-button').addEventListener('click', function() {
- if (!ssl)
- sendCommand(SB_CMD_TAKE_ME_BACK);
- else if (badClock)
- sendCommand(SSL_CMD_CLOCK);
- else if (overridable)
- sendCommand(SSL_CMD_DONT_PROCEED);
- else
- sendCommand(SSL_CMD_RELOAD);
+ switch (interstitialType) {
+ case 'CAPTIVE_PORTAL':
+ sendCommand(CAPTIVEPORTAL_CMD_OPEN_LOGIN_PAGE);
+ break;
+
+ case 'SSL':
+ if (badClock)
+ sendCommand(SSL_CMD_CLOCK);
+ else if (overridable)
+ sendCommand(SSL_CMD_DONT_PROCEED);
+ else
+ sendCommand(SSL_CMD_RELOAD);
+ break;
+
+ case 'SAFEBROWSING':
+ sendCommand(SB_CMD_TAKE_ME_BACK);
+ break;
+
+ default:
+ throw 'Invalid interstitial type';
+ }
});
}
if (overridable) {
+ // Captive portal page isn't overridable.
$('proceed-link').addEventListener('click', function(event) {
sendCommand(ssl ? SSL_CMD_PROCEED : SB_CMD_PROCEED);
});
@@ -115,17 +133,22 @@ function setupEvents() {
});
}
- $('details-button').addEventListener('click', function(event) {
- var hiddenDetails = $('details').classList.toggle('hidden');
- $('details-button').innerText = hiddenDetails ?
- loadTimeData.getString('openDetails') :
- loadTimeData.getString('closeDetails');
- if (!expandedDetails) {
- // Record a histogram entry only the first time that details is opened.
- sendCommand(ssl ? SSL_CMD_MORE : SB_CMD_EXPANDED_SEE_MORE);
- expandedDetails = true;
- }
- });
+ if (captivePortal) {
+ // Captive portal page doesn't have details button.
+ $('details-button').classList.add('hidden');
+ } else {
+ $('details-button').addEventListener('click', function(event) {
+ var hiddenDetails = $('details').classList.toggle('hidden');
+ $('details-button').innerText = hiddenDetails ?
+ loadTimeData.getString('openDetails') :
+ loadTimeData.getString('closeDetails');
+ if (!expandedDetails) {
+ // Record a histogram entry only the first time that details is opened.
+ sendCommand(ssl ? SSL_CMD_MORE : SB_CMD_EXPANDED_SEE_MORE);
+ expandedDetails = true;
+ }
+ });
+ }
preventDefaultOnPoundLinkClicks();
setupCheckbox();
« no previous file with comments | « chrome/browser/resources/security_warnings/interstitial_v2.html ('k') | chrome/browser/ssl/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698