Clock interstitial: refine iOS text and hide 'Advanced' button.

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 49 matching lines @@
 }
 
 function toggleDebuggingInfo() {
   $('error-debugging-info').classList.toggle('hidden');
 }
 
 function setupEvents() {
   var overridable = loadTimeData.getBoolean('overridable');
   var ssl = loadTimeData.getString('type') === 'SSL';
   var badClock = ssl && loadTimeData.getBoolean('bad_clock');
+  var hidePrimaryButton = badClock && loadTimeData.getBoolean(
+                              'hide_primary_button');

[Bernhard Bauer, 2014/11/03 12:18:08]

Nit: just indent this four spaces.

[lgarron, 2014/11/04 02:13:50]

Acknowledged.

 
   if (ssl) {
     $('body').classList.add(badClock ? 'bad-clock' : 'ssl');
     $('error-code').textContent = loadTimeData.getString('errorCode');
     $('error-code').classList.remove('hidden');
   } else {
     $('body').classList.add('safe-browsing');
   }
 
-  $('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);
-  });
+  if (hidePrimaryButton) {
+    $('primary-button').classList.add('hidden');
+  }
+  else {

[felt, 2014/11/01 21:39:11]

} else {

[lgarron, 2014/11/04 02:13:50]

Acknowledged.

+    $('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);
+    });
+  }
 
   if (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) {
-    if (badClock) {
-      sendCommand(SSL_CMD_RELOAD);
-    } else {
-      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;
-      }
+    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);