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

chrome/browser/ssl/ssl_blocking_page.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/ssl/ssl_blocking_page.h"
 
 #include "base/build_time.h"
 #include "base/command_line.h"
 #include "base/i18n/rtl.h"
 #include "base/i18n/time_formatting.h"
@@ skipping 215 matching lines @@
   chrome::ShowSettingsSubPageForProfile(
       ProfileManager::GetActiveUserProfile(), sub_page);
   return;
 #elif defined(OS_ANDROID)
   CommandLine command(base::FilePath("/system/bin/am"));
   command.AppendArg("start");
   command.AppendArg(
       "'com.android.settings/.Settings$DateTimeSettingsActivity'");
 #elif defined(OS_IOS)
   // iOS does not have a way to launch the date and time settings.
-  return;
+  NOTREACHED();
 #elif defined(OS_LINUX)
   struct ClockCommand {
     const char* pathname;
     const char* argument;
   };
   static const ClockCommand kClockCommands[] = {
     // Unity
     { "/usr/bin/unity-control-center", "datetime" },
     // GNOME
     //
@@ skipping 178 matching lines @@
 
   base::Time now = base::Time::NowFromSystemTime();
   bool bad_clock = IsErrorDueToBadClock(now, cert_error_);
 
   load_time_data.SetString("errorCode", net::ErrorToString(cert_error_));
 
   if (bad_clock) {
     load_time_data.SetBoolean("bad_clock", true);
     load_time_data.SetBoolean("overridable", false);
 
+#if defined(OS_IOS)
+    load_time_data.SetBoolean("hide_primary_button", true);
+#else
+    load_time_data.SetBoolean("hide_primary_button", false);
+#endif
+
     // We're showing the SSL clock warning to be helpful, but we haven't warned
     // them about the risks. (And there might still be an SSL error after they
     // fix their clock.) Thus, we don't allow the "danger" override in this
     // case.
     danger_overridable_ = false;
 
     int heading_string = SSLErrorClassification::IsUserClockInTheFuture(now) ?
                               IDS_SSL_V2_CLOCK_AHEAD_HEADING :
                               IDS_SSL_V2_CLOCK_BEHIND_HEADING;
 
     load_time_data.SetString(
         "tabTitle",
         l10n_util::GetStringUTF16(IDS_SSL_V2_CLOCK_TITLE));
     load_time_data.SetString(
         "heading",
         l10n_util::GetStringUTF16(heading_string));
     load_time_data.SetString("primaryParagraph",
                              l10n_util::GetStringFUTF16(
                                  IDS_SSL_V2_CLOCK_PRIMARY_PARAGRAPH ,
                                  url,
                                  base::TimeFormatFriendlyDateAndTime(now)));
 
     load_time_data.SetString(
         "primaryButtonText",
         l10n_util::GetStringUTF16(IDS_SSL_V2_CLOCK_UPDATE_DATE_AND_TIME));
-    load_time_data.SetString(
-       "openDetails",
-       l10n_util::GetStringUTF16(IDS_SSL_RELOAD));
+
+    // We set the "Advanced" link to be empty so that it doesn't appear.
+    load_time_data.SetString("openDetails", std::string());

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

Does this work well? Do you end up with a single space or a small area you can
hover over to click on, or does it just become completely invisible?

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

You end up with an <a> element that has no dimensions. Nothing is visible or
clickable (unless someone changes the CSS in an unnatural way).

I'm happy to "actually" hide the button, but I wanted to limit the number of
special code paths until the interstitial types are refactored.

 
     // The interstitial template expects these strings, but we're not using
     // them. So we send blank strings for now.
     load_time_data.SetString("explanationParagraph", std::string());
     load_time_data.SetString("finalParagraph", std::string());
   } else {
     load_time_data.SetBoolean("bad_clock", false);
 
     load_time_data.SetString(
         "tabTitle", l10n_util::GetStringUTF16(IDS_SSL_V2_TITLE));
@@ skipping 226 matching lines @@
   for (; i < 5; i++) {
     strings->SetString(keys[i], std::string());
   }
 }
 
 void SSLBlockingPage::OnGotHistoryCount(bool success,
                                         int num_visits,
                                         base::Time first_visit) {
   num_visits_ = num_visits;
 }