Surface button for loading stale cache copy on net error page.

chrome/common/localized_error.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/common/localized_error.h"
 
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 481 matching lines @@
 LocalizedError::ErrorPageParams::ErrorPageParams() : suggest_reload(false) {
 }
 
 LocalizedError::ErrorPageParams::~ErrorPageParams() {
 }
 
 void LocalizedError::GetStrings(int error_code,
                                 const std::string& error_domain,
                                 const GURL& failed_url,
                                 bool is_post,
-                                bool stale_copy_in_cache,
+                                bool stale_load_button,

[mmenke, 2014/04/11 19:42:32]

nit:  Maybe show_stale_load_button?

[Randy Smith (Not in Mondays), 2014/04/14 22:02:13]

Done.

                                 const std::string& locale,
                                 const std::string& accept_languages,
                                 scoped_ptr<ErrorPageParams> params,
                                 base::DictionaryValue* error_strings) {
   bool rtl = LocaleIsRTL();
   error_strings->SetString("textdirection", rtl ? "rtl" : "ltr");
 
   // Grab the strings and settings that depend on the error type.  Init
   // options with default values.
   LocalizedErrorMap options = {
@@ skipping 129 matching lines @@
     error_strings->SetString("searchUrl", params->search_url.spec());
     error_strings->SetString("searchTerms", params->search_terms);
   }
 
   // Add the reload suggestion, if needed.
   if (params->suggest_reload) {
     if (!is_post) {
       base::DictionaryValue* reload_button = new base::DictionaryValue;
       reload_button->SetString("msg",
           l10n_util::GetStringUTF16(IDS_ERRORPAGES_BUTTON_RELOAD));
       reload_button->SetString("reloadUrl", failed_url.spec());

[mmenke, 2014/04/11 19:42:32]

This string is no longer used.

[Randy Smith (Not in Mondays), 2014/04/14 22:02:13]

Right.  Got rid of the subdirectory and just assigned the message to
reloadButton directly.

(Note: I may revert this as part of handling the potential IOS breakage.  If I
do, I'll do it in a separate PS, so you can review just what I've done to handle
that case separately.)

-      error_strings->Set("reload", reload_button);
+      error_strings->Set("reloadButton", reload_button);
     } else {
       // If the page was created by a post, it can't be reloaded in the same
       // way, so just add a suggestion instead.
       // TODO(mmenke):  Make the reload button bring up the repost confirmation
       //                dialog for pages resulting from posts.
       base::DictionaryValue* suggest_reload_repost = new base::DictionaryValue;
       suggest_reload_repost->SetString("header",
           l10n_util::GetStringUTF16(
               IDS_ERRORPAGES_SUGGESTION_RELOAD_REPOST_HEADER));
       suggest_reload_repost->SetString("body",
           l10n_util::GetStringUTF16(
               IDS_ERRORPAGES_SUGGESTION_RELOAD_REPOST_BODY));
       // Add at the front, so it appears before other suggestions, in the case
       // suggestions are being overridden by |params|.
       suggestions->Insert(0, suggest_reload_repost);
     }
   }
 
   // If not using the default suggestions, nothing else to do.
   if (!use_default_suggestions)
     return;
 
-  error_strings->SetBoolean("staleCopyInCache", stale_copy_in_cache);
+  if (stale_load_button) {
+    base::DictionaryValue* stale_load_button = new base::DictionaryValue;
+    stale_load_button->SetString(
+        "msg", l10n_util::GetStringUTF16(IDS_ERRORPAGES_BUTTON_LOAD_STALE));
+    stale_load_button->SetString(
+        "title",
+        l10n_util::GetStringUTF16(IDS_ERRORPAGES_BUTTON_LOAD_STALE_HELP));
+    error_strings->Set("staleLoadButton", stale_load_button);
+  }
 
 #if defined(OS_CHROMEOS)
   error_strings->SetString(
       "diagnose", l10n_util::GetStringUTF16(IDS_ERRORPAGES_BUTTON_DIAGNOSE));
 #endif  // defined(OS_CHROMEOS)
 
   if (options.suggestions & SUGGEST_CHECK_CONNECTION) {
     base::DictionaryValue* suggest_check_connection = new base::DictionaryValue;
     suggest_check_connection->SetString("header",
         l10n_util::GetStringUTF16(
@@ skipping 168 matching lines @@
 #if defined(OS_CHROMEOS)
   GURL learn_more_url(kAppWarningLearnMoreUrl);
   base::DictionaryValue* suggest_learn_more = new base::DictionaryValue();
   suggest_learn_more->SetString("msg",
                                 l10n_util::GetStringUTF16(
                                     IDS_ERRORPAGES_SUGGESTION_LEARNMORE_BODY));
   suggest_learn_more->SetString("learnMoreUrl", learn_more_url.spec());
   error_strings->Set("suggestionsLearnMore", suggest_learn_more);
 #endif  // defined(OS_CHROMEOS)
 }