Add advanced details to the SSL clock interstitial.

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 405 matching lines @@
 
 std::string SSLBlockingPage::GetHTMLContents() {
   base::DictionaryValue load_time_data;
   base::string16 url(ASCIIToUTF16(request_url_.host()));
   if (base::i18n::IsRTL())
     base::i18n::WrapStringWithLTRFormatting(&url);
   webui::SetFontAndTextDirection(&load_time_data);
 
   load_time_data.SetString("type", "SSL");
 
+  // Shared UI configuration for all SSL interstitials.
+

[felt, 2014/11/04 21:59:08]

nit: no need for this extra newline between the comment & code

[lgarron, 2014/11/04 22:06:14]

"No need" or "preferred"? (I like to keep my code pretty spaced out, even when
I'm adapting to other code styles.)

[felt, 2014/11/04 22:15:29]

The style is to not have spaces between comments and code blocks.

[lgarron, 2014/11/04 22:21:20]

Has anyone thought about, y'know, putting this stuff in the style guide? :-P
http://google-styleguide.googlecode.com/svn/trunk/cppguide.html#Comment_Style

   base::Time now = base::Time::NowFromSystemTime();
   bool bad_clock = IsErrorDueToBadClock(now, cert_error_);
 
   load_time_data.SetString("errorCode", net::ErrorToString(cert_error_));
+    load_time_data.SetString(

[felt, 2014/11/04 21:59:08]

these are indented too much

[lgarron, 2014/11/04 22:06:14]

Yeah, the third patch took me a while to upload because building (just for a
sanity check) failed and I had to build from scratch. :-(

+       "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.
 

[felt, 2014/11/04 21:59:08]

nit: no need for this extra newline between the comment & code

   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
 
@@ skipping 15 matching lines @@
         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(
+        "explanationParagraph",
+        l10n_util::GetStringUTF16(IDS_SSL_V2_CLOCK_EXPLANATION));
 
-    // We set the "Advanced" link to be empty so that it doesn't appear.
-    load_time_data.SetString("openDetails", std::string());
-
-    // 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());
+    // The interstitial template expects this string, but we're not using it. So
+    // we send a blank string for now.
     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));
     load_time_data.SetString(
         "heading", l10n_util::GetStringUTF16(IDS_SSL_V2_HEADING));
     load_time_data.SetString(
         "primaryParagraph",
         l10n_util::GetStringFUTF16(IDS_SSL_V2_PRIMARY_PARAGRAPH, url));
-    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));
 
     if (overridable_) {
       load_time_data.SetBoolean("overridable", true);
 
       SSLErrorInfo error_info =
           SSLErrorInfo::CreateError(
               SSLErrorInfo::NetErrorToErrorType(cert_error_),
               ssl_info_.cert.get(),
               request_url_);
       load_time_data.SetString("explanationParagraph", error_info.details());
@@ skipping 205 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;
 }