Chromium Code Reviews| Index: chrome/browser/ssl/ssl_blocking_page.cc |
| diff --git a/chrome/browser/ssl/ssl_blocking_page.cc b/chrome/browser/ssl/ssl_blocking_page.cc |
| index 0a284083e42cc9fc5f20ad30d48d3660461a30d6..ac51fe8c9aa443f9d97a2d504fb5ac31ec4b424e 100644 |
| --- a/chrome/browser/ssl/ssl_blocking_page.cc |
| +++ b/chrome/browser/ssl/ssl_blocking_page.cc |
| @@ -423,10 +423,20 @@ std::string SSLBlockingPage::GetHTMLContents() { |
| 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 co
lgarron
2014/11/04 22:06:14
"No need" or "preferred"? (I like to keep my code
felt
2014/11/04 22:15:29
The style is to not have spaces between comments a
lgarron
2014/11/04 22:21:20
Has anyone thought about, y'know, putting this stu
|
| 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 be
|
| + "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 co
|
| if (bad_clock) { |
| load_time_data.SetBoolean("bad_clock", true); |
| @@ -463,13 +473,12 @@ std::string SSLBlockingPage::GetHTMLContents() { |
| 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); |
| @@ -481,12 +490,6 @@ std::string SSLBlockingPage::GetHTMLContents() { |
| 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); |