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 651 matching lines @@
               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 (stale_copy_in_cache) {

[mmenke, 2014/03/26 15:06:14]

I suggest putting this below use_default_suggestions.  Suggesting loading from
Google's cache and a separate suggestion to load from the local cache just seems
very weird to me.

[Randy Smith (Not in Mondays), 2014/03/26 20:40:12]

This currently happens only in the link doctor case?  (That's what it looks like
to me from reading the code, but I want to check.)  I'm ok but a little
uncomfortable with this--the problem is that there's no reason in this
particular section of code why we'd make loading a stale copy dependent on
whether or not we're doing non-default suggestions; there isn't any reason why
the non-default suggestions would have anything to do with a cache.  But it's a
pretty minor point, and I agree with the goal.

[mmenke, 2014/03/27 14:28:28]

Yes, this is only in the Link Doctor case.  This is actually a "default
suggestion", as I see it (Though renaming the bool to suggest_load_from_cache
would change that opinion), but my real concern is just the two cache links, not
what is and is not "default".  If you want to just hide the button when Google
suggests we check it's cache, though that gets a bit hairy (And I've seen Link
Doctor lie about what's in Google's cache).

[Randy Smith (Not in Mondays), 2014/04/02 19:20:58]

Yeah, I thought about what it would take to do it the "right" way, and decided
against.  So yes, load stale cache is a default suggestion; I'm good with that
:-}.

+    base::DictionaryValue* stale_load_button = new base::DictionaryValue;
+    stale_load_button->SetString(
+        "msg", l10n_util::GetStringUTF16(IDS_ERRORPAGES_BUTTON_STALE));

[mmenke, 2014/03/26 15:06:14]

This subdirectory isn't needed.  Instead you can just set staleCopyInCache(Or
whatever) to be this string directly, and use the attibutes on the button:

jscontent="staleCopyInCache" jsdisplay="staleCopyInCache"

[Randy Smith (Not in Mondays), 2014/03/26 20:40:12]

Done (now that I understand what's going on :-}).

+    error_strings->Set("staleCopyInCache", stale_load_button);

[mmenke, 2014/03/26 15:06:14]

Getting the "IDS_ERRORPAGES_BUTTON_STALE" string, storing it in the
"stale_load_button" value, and then putting it in the "staleCopyInCache"
Javascript variable seems a little weird (Admittedly, this is the case with the
reload button as well).

I suggest renaming them to be more consistent.  Just to throw out one
suggestion:

IDS_ERRORPAGES_BUTTON_LOAD_STALE / stale_load_button / staleLoadButton

[Randy Smith (Not in Mondays), 2014/03/26 20:40:12]

Done.  Let me know if you'd like me to regularize the reload button.

[mmenke, 2014/03/27 14:28:28]

I think it'd be great if you went ahead and cleaned that up while you're here.

[Randy Smith (Not in Mondays), 2014/04/02 19:20:58]

I believe I've done this (just changing the templateData name from "reload" to
"reloadButton"); let me know if you think I've missed something.

+  }
+
   // If not using the default suggestions, nothing else to do.
   if (!use_default_suggestions)
     return;
 
-  error_strings->SetBoolean("staleCopyInCache", stale_copy_in_cache);
-
 #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(
             IDS_ERRORPAGES_SUGGESTION_CHECK_CONNECTION_HEADER));
@@ skipping 167 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)
 }