New SSL interstitial (behind Finch flag)

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/i18n/rtl.h"
+#include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_preferences_util.h"
@@ skipping 235 matching lines @@
                                        captive_portal_detection_enabled_,
                                        captive_portal_probe_completed_,
                                        captive_portal_no_response_,
                                        captive_portal_detected_);
     // The page is closed without the user having chosen what to do, default to
     // deny.
     NotifyDenyCertificate();
   }
 }
 
+std::string SSLBlockingPage::GetHTMLContentsV2() {
+  base::DictionaryValue strings;
+  SSLErrorInfo error_info =
+      SSLErrorInfo::CreateError(
+          SSLErrorInfo::NetErrorToErrorType(cert_error_),
+          ssl_info_.cert.get(),
+          request_url_);
+  base::string16 url(ASCIIToUTF16(request_url_.host()));
+  bool rtl = base::i18n::IsRTL();
+  strings.SetString("textDirection", rtl ? "rtl" : "ltr");
+  if (rtl)
+    base::i18n::WrapStringWithLTRFormatting(&url);
+
+  strings.SetString(
+      "tabTitle", l10n_util::GetStringUTF16(IDS_SSL_OVERRIDABLE_TITLE));
+  strings.SetString(
+      "heading", l10n_util::GetStringUTF16(IDS_SSL_OVERRIDABLE_HEADING));
+  strings.SetString(
+      "primaryParagraph",
+      l10n_util::GetStringFUTF16(IDS_SSL_OVERRIDABLE_PRIMARY_PARAGRAPH,
+                                 url.c_str()));
+  strings.SetString(
+      "explanationParagraph", error_info.details());
+  strings.SetString(
+      "safetyButtonText",
+      l10n_util::GetStringUTF16(IDS_SSL_OVERRIDABLE_SAFETY_BUTTON));
+  strings.SetString(
+      "openDetails",
+      l10n_util::GetStringUTF16(IDS_SSL_OVERRIDABLE_OPEN_DETAILS_BUTTON));
+  strings.SetString(
+      "closeDetails",
+      l10n_util::GetStringUTF16(IDS_SSL_OVERRIDABLE_CLOSE_DETAILS_BUTTON));
+  strings.SetString(
+      "proceedParagraph",
+      l10n_util::GetStringFUTF16(IDS_SSL_OVERRIDABLE_PROCEED_PARAGRAPH,
+                                 url.c_str()));
+
+  base::StringPiece html(
+     ResourceBundle::GetSharedInstance().GetRawDataResource(
+         IRD_SSL_OVERRIDABLE_V2_HTML));
+  return webui::GetI18nTemplateHtml(html, &strings);
+}
+
 std::string SSLBlockingPage::GetHTMLContents() {
   base::DictionaryValue strings;
   int resource_id;
   if (overridable_ && !strict_enforcement_) {
+    // Check to see if the v2 version should be displayed instead.
+    if (base::FieldTrialList::FindFullName("InterstitialsV2") == "ShowV2")
+      return GetHTMLContentsV2();
+
     // Let's build the overridable error page.
     SSLErrorInfo error_info =
         SSLErrorInfo::CreateError(
             SSLErrorInfo::NetErrorToErrorType(cert_error_),
             ssl_info_.cert.get(),
             request_url_);
 
     resource_id = IDR_SSL_ROAD_BLOCK_HTML;
     strings.SetString("headLine", error_info.title());
     strings.SetString("description", error_info.details());
@@ skipping 259 matching lines @@
     // sure we don't clear the captive portal flag, since the interstitial was
     // potentially caused by the captive portal.
     captive_portal_detected_ = captive_portal_detected_ ||
         (results->result == captive_portal::RESULT_BEHIND_CAPTIVE_PORTAL);
     // Also keep track of non-HTTP portals and error cases.
     captive_portal_no_response_ = captive_portal_no_response_ ||
         (results->result == captive_portal::RESULT_NO_RESPONSE);
   }
 #endif
 }