Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(324)

Unified Diff: chrome/browser/ssl/ssl_blocking_page.cc

Issue 693093003: Clock interstitial: refine iOS text and hide 'Advanced' button. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 a65ff4d184040c0182a5e5242668e3bd33f26691..0a284083e42cc9fc5f20ad30d48d3660461a30d6 100644
--- a/chrome/browser/ssl/ssl_blocking_page.cc
+++ b/chrome/browser/ssl/ssl_blocking_page.cc
@@ -233,7 +233,7 @@ void LaunchDateAndTimeSettings() {
"'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;
@@ -432,6 +432,12 @@ std::string SSLBlockingPage::GetHTMLContents() {
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
@@ -457,9 +463,9 @@ std::string SSLBlockingPage::GetHTMLContents() {
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 s
lgarron 2014/11/04 02:13:50 You end up with an <a> element that has no dimensi
// The interstitial template expects these strings, but we're not using
// them. So we send blank strings for now.

Powered by Google App Engine
This is Rietveld 408576698