Add custom interstitial for captive portals.

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 312 matching lines @@
 SSLBlockingPage::SSLBlockingPage(content::WebContents* web_contents,
                                  int cert_error,
                                  const net::SSLInfo& ssl_info,
                                  const GURL& request_url,
                                  int options_mask,
                                  const base::Callback<void(bool)>& callback)
     : SecurityInterstitialPage(web_contents, request_url),
       callback_(callback),
       cert_error_(cert_error),
       ssl_info_(ssl_info),
-      overridable_(options_mask & OVERRIDABLE &&
-                   !(options_mask & STRICT_ENFORCEMENT)),
+      overridable_(IsOverridable(options_mask)),
       danger_overridable_(true),
       strict_enforcement_((options_mask & STRICT_ENFORCEMENT) != 0),
       internal_(false),
       num_visits_(-1),
       expired_but_previously_allowed_(
           (options_mask & EXPIRED_BUT_PREVIOUSLY_ALLOWED) != 0) {
   Profile* profile = Profile::FromBrowserContext(
       web_contents->GetBrowserContext());
   // For UMA stats.
   if (SSLErrorClassification::IsHostnameNonUniqueOrDotless(
@@ skipping 100 matching lines @@
   load_time_data->SetString("errorCode", net::ErrorToString(cert_error_));
   load_time_data->SetString(
       "openDetails",
       l10n_util::GetStringUTF16(IDS_SSL_V2_OPEN_DETAILS_BUTTON));
   load_time_data->SetString(
       "closeDetails",
       l10n_util::GetStringUTF16(IDS_SSL_V2_CLOSE_DETAILS_BUTTON));
 
   // Conditional UI configuration.
   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",

[mmenke, 2014/11/26 18:57:48]

Mind having someone else review the js / HTML related changes for the
interstitial?  I don't think there's much reason for me to learn them well
enough to do a good review of these changes.

[meacer, 2014/12/08 22:29:51]

Sure, will do.

                               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(
         "explanationParagraph",
@@ skipping 225 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;
 }