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 ab376c277ee056b22268d083dafd98bd7fd43f35..3c5a77c6829c7c67468a4d0ab80900d0a9c399cb 100644 |
--- a/chrome/browser/resources/security_warnings/interstitial_v2.js |
+++ b/chrome/browser/resources/security_warnings/interstitial_v2.js |
@@ -66,25 +66,33 @@ function toggleDebuggingInfo() { |
function setupEvents() { |
var overridable = loadTimeData.getBoolean('overridable'); |
var ssl = loadTimeData.getString('type') === 'SSL'; |
+ var captivePortal = loadTimeData.getString('type') == 'CAPTIVE_PORTAL'; |
if (ssl) { |
$('body').classList.add('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'); |
} |
$('primary-button').addEventListener('click', function() { |
- if (!ssl) |
+ if (captivePortal) { |
+ sendCommand(CAPTIVEPORTAL_CMD_OPEN_LOGIN_PAGE); |
+ } else if (ssl) { |
+ if (overridable) |
+ sendCommand(SSL_CMD_DONT_PROCEED); |
+ else |
+ sendCommand(SSL_CMD_RELOAD); |
+ } else { |
sendCommand(SB_CMD_TAKE_ME_BACK); |
- else if (overridable) |
- sendCommand(SSL_CMD_DONT_PROCEED); |
- else |
- sendCommand(SSL_CMD_RELOAD); |
+ } |
}); |
if (overridable) { |
+ // Captive portal page isn't overridable. |
$('proceed-link').addEventListener('click', function(event) { |
sendCommand(ssl ? SSL_CMD_PROCEED : SB_CMD_PROCEED); |
}); |
@@ -112,17 +120,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(); |