Add custom interstitial for captive portals.

chrome/browser/resources/security_warnings/interstitial_v2.js

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This is the shared code for the new (Chrome 37) security interstitials. It is
 // used for both SSL interstitials and Safe Browsing interstitials.
 
 var expandedDetails = false;
 var keyPressState = 0;
 
@@ skipping 47 matching lines @@
   pElem.appendChild(spanValue);
   $('error-debugging-info').appendChild(pElem);
 }
 
 function toggleDebuggingInfo() {
   $('error-debugging-info').classList.toggle('hidden');
 }
 
 function setupEvents() {
   var overridable = loadTimeData.getBoolean('overridable');
-  var ssl = loadTimeData.getString('type') === 'SSL';
+  var interstitialType = loadTimeData.getString('type');
+  var ssl = interstitialType === 'SSL';

[Bernhard Bauer, 2014/12/18 18:10:06]

The === isn't really necessary here if you know that |interstitialType| is going
to be a string and not a weird object.

[meacer, 2014/12/19 02:42:24]

Done.

+  var captivePortal = interstitialType === 'CAPTIVE_PORTAL';
   var badClock = ssl && loadTimeData.getBoolean('bad_clock');
   var hidePrimaryButton = badClock && loadTimeData.getBoolean(
       'hide_primary_button');
 
   if (ssl) {
     $('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');
   }
 
   if (hidePrimaryButton) {
     $('primary-button').classList.add('hidden');
   } else {
     $('primary-button').addEventListener('click', function() {
-      if (!ssl)
+      switch (interstitialType) {
+        case 'CAPTIVE_PORTAL':
+        sendCommand(CAPTIVEPORTAL_CMD_OPEN_LOGIN_PAGE);

[Bernhard Bauer, 2014/12/18 18:10:06]

This should be indented two more spaces.

[meacer, 2014/12/19 02:42:24]

Done.

+        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);
-      else if (badClock)
-        sendCommand(SSL_CMD_CLOCK);
-      else if (overridable)
-        sendCommand(SSL_CMD_DONT_PROCEED);
-      else
-        sendCommand(SSL_CMD_RELOAD);
+        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);
     });
   } else if (!ssl) {
     $('final-paragraph').classList.add('hidden');
   }
 
   if (ssl && overridable) {
     $('proceed-link').classList.add('small-link');
   } else if ($('help-link')) {
     // Overridable SSL page doesn't have this link.
     $('help-link').addEventListener('click', function(event) {
       if (ssl)
         sendCommand(SSL_CMD_HELP);
       else if (loadTimeData.getBoolean('phishing'))
         sendCommand(SB_CMD_LEARN_MORE_2);
       else
         sendCommand(SB_CMD_SHOW_DIAGNOSTIC);
     });
   }
 
-  $('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();
   setupSSLDebuggingInfo();
   document.addEventListener('keypress', handleKeypress);
 }
 
 document.addEventListener('DOMContentLoaded', setupEvents);