New network error pages, part 1.

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/string16.h"
+#include "base/string_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/extension_set.h"
 #include "googleurl/src/gurl.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "net/base/escape.h"
 #include "net/base/net_errors.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebURLError.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "webkit/glue/webkit_glue.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #endif
 
 using WebKit::WebURLError;
 
+// Some error pages have no details.
+#define IDS_ERRORPAGES_DETAILS_NULL 0
+
 namespace {
 
 static const char kRedirectLoopLearnMoreUrl[] =
     "https://www.google.com/support/chrome/bin/answer.py?answer=95626";
 static const char kWeakDHKeyLearnMoreUrl[] =
     "http://sites.google.com/a/chromium.org/dev/"
     "err_ssl_weak_server_ephemeral_dh_key";
 #if defined(OS_CHROMEOS)
 static const char kAppWarningLearnMoreUrl[] =
     "chrome-extension://honijodknafkokifofgiaalefdiedpko/main.html"
@@ skipping 292 matching lines @@
   },
   {505,
    IDS_ERRORPAGES_TITLE_LOAD_FAILED,
    IDS_ERRORPAGES_HEADING_HTTP_SERVER_ERROR,
    IDS_ERRORPAGES_SUMMARY_WEBSITE_CANNOT_HANDLE,
    IDS_ERRORPAGES_DETAILS_HTTP_VERSION_NOT_SUPPORTED,
    SUGGEST_NONE,
   },
 };
 
-const char* HttpErrorToString(int status_code) {
-  switch (status_code) {
-  case 403:
-    return "Forbidden";
-  case 410:
-    return "Gone";
-  case 500:
-    return "Internal Server Error";
-  case 501:
-    return "Not Implemented";
-  case 502:
-    return "Bad Gateway";
-  case 503:
-    return "Service Unavailable";
-  case 504:
-    return "Gateway Timeout";
-  case 505:
-    return "HTTP Version Not Supported";
-  default:
-    return "";
-  }
-}
-
-string16 GetErrorDetailsString(const std::string& error_domain,
-                               int error_code,
-                               const string16& details) {
-  int error_page_template;
-  const char* error_string;
-  if (error_domain == net::kErrorDomain) {
-    error_page_template = IDS_ERRORPAGES_DETAILS_TEMPLATE;
-    error_string = net::ErrorToString(error_code);
-    DCHECK(error_code < 0);  // Net error codes are negative.
-    error_code = -error_code;
-  } else if (error_domain == LocalizedError::kHttpErrorDomain) {
-    error_page_template = IDS_ERRORPAGES_HTTP_DETAILS_TEMPLATE;
-    error_string = HttpErrorToString(error_code);
-  } else {
-    NOTREACHED();
-    return string16();
-  }
-  return l10n_util::GetStringFUTF16(
-      error_page_template,
-      base::IntToString16(error_code),
-      ASCIIToUTF16(error_string),
-      details);
-}
-
 const LocalizedErrorMap* FindErrorMapInArray(const LocalizedErrorMap* maps,
                                                    size_t num_maps,
                                                    int error_code) {
   for (size_t i = 0; i < num_maps; ++i) {
     if (maps[i].error_code == error_code)
       return &maps[i];
   }
   return NULL;
 }
 
@@ skipping 44 matching lines @@
   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 = {
     0,
     IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
     IDS_ERRORPAGES_HEADING_NOT_AVAILABLE,
     IDS_ERRORPAGES_SUMMARY_NOT_AVAILABLE,
-    IDS_ERRORPAGES_DETAILS_UNKNOWN,
+    IDS_ERRORPAGES_DETAILS_NULL,
     SUGGEST_NONE,
   };
 
   const std::string error_domain = error.domain.utf8();
   int error_code = error.reason;
   const LocalizedErrorMap* error_map =
       LookupErrorMap(error_domain, error_code);
   if (error_map)
     options = *error_map;
 
-  if (options.suggestions != SUGGEST_NONE) {
-    error_strings->SetString(
-        "suggestionsHeading",
-        l10n_util::GetStringUTF16(IDS_ERRORPAGES_SUGGESTION_HEADING));
-  }
-
   const GURL failed_url = error.unreachableURL;
 
   // If we got "access denied" but the url was a file URL, then we say it was a
   // file instead of just using the "not available" default message. Just adding
   // ERR_ACCESS_DENIED to the map isn't sufficient, since that message may be
   // generated by some OSs when the operation doesn't involve a file URL.
   if (error_domain == net::kErrorDomain &&
       error_code == net::ERR_ACCESS_DENIED &&
       failed_url.scheme() == "file") {
     options.title_resource_id = IDS_ERRORPAGES_TITLE_ACCESS_DENIED;
     options.heading_resource_id = IDS_ERRORPAGES_HEADING_FILE_ACCESS_DENIED;
     options.summary_resource_id = IDS_ERRORPAGES_SUMMARY_FILE_ACCESS_DENIED;
     options.details_resource_id = IDS_ERRORPAGES_DETAILS_FILE_ACCESS_DENIED;
     options.suggestions = SUGGEST_NONE;
   }
 
+  // If there are any suggestions other than reload, popuplate the suggestion

[eroman, 2013/02/27 02:26:16]

typo: populate

[mmenke, 2013/02/27 02:43:01]

Done.

+  // heading (reload has a button, rather than a suggestion in the list).
+  if ((options.suggestions & ~SUGGEST_RELOAD) != SUGGEST_NONE) {
+    error_strings->SetString(
+        "suggestionsHeading",
+        l10n_util::GetStringUTF16(IDS_ERRORPAGES_SUGGESTION_HEADING));
+  }
+
   string16 failed_url_string(ASCIIToUTF16(failed_url.spec()));
   // URLs are always LTR.
   if (rtl)
     base::i18n::WrapStringWithLTRFormatting(&failed_url_string);
   error_strings->SetString("title",
       l10n_util::GetStringFUTF16(options.title_resource_id, failed_url_string));
   error_strings->SetString("heading",
       l10n_util::GetStringUTF16(options.heading_resource_id));
 
   DictionaryValue* summary = new DictionaryValue;
   summary->SetString("msg",
       l10n_util::GetStringUTF16(options.summary_resource_id));
   // TODO(tc): We want the unicode url and host here since they're being
   //           displayed.
   summary->SetString("failedUrl", failed_url_string);
   summary->SetString("hostName", failed_url.host());
   summary->SetString("productName",
                      l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
+
+  error_strings->SetString(
+      "more", l10n_util::GetStringUTF16(IDS_ERRORPAGES_BUTTON_MORE));
+  error_strings->SetString(
+      "less", l10n_util::GetStringUTF16(IDS_ERRORPAGES_BUTTON_LESS));
   error_strings->Set("summary", summary);
 
-  string16 details = l10n_util::GetStringUTF16(options.details_resource_id);
-  error_strings->SetString("details",
-      GetErrorDetailsString(error_domain, error_code, details));
+  if (options.details_resource_id != IDS_ERRORPAGES_DETAILS_NULL) {
+    error_strings->SetString(
+        "errorDetails", l10n_util::GetStringUTF16(options.details_resource_id));
+  }
+
+  string16 error_string;
+  if (error_domain == net::kErrorDomain) {
+    // Non-internationalized error string, for debugging Chrome itself.
+    std::string ascii_error_string = net::ErrorToString(error_code);
+    // Remove the leading "net::" from the returned string.
+    RemoveChars(ascii_error_string, "net:", &ascii_error_string);
+    error_string = ASCIIToUTF16(ascii_error_string);
+  } else {
+    DCHECK_EQ(LocalizedError::kHttpErrorDomain, error_domain);
+    error_string = base::IntToString16(error_code);
+  }
+  error_strings->SetString("errorCode",
+      l10n_util::GetStringFUTF16(IDS_ERRORPAGES_ERROR_CODE, error_string));
 
   // Platform specific instructions for diagnosing network issues on OSX and
   // Windows.
 #if defined(OS_MACOSX) || defined(OS_WIN)
   if (error_domain == net::kErrorDomain &&
       error_code == net::ERR_INTERNET_DISCONNECTED) {
     int platform_string_id =
         IDS_ERRORPAGES_SUMMARY_INTERNET_DISCONNECTED_PLATFORM;
 #if defined(OS_WIN)
     // Different versions of Windows have different instructions.
@@ skipping 12 matching lines @@
     // dependent portion of the summary section.
     summary->SetString("msg",
         l10n_util::GetStringFUTF16(
             IDS_ERRORPAGES_SUMMARY_INTERNET_DISCONNECTED_INSTRUCTIONS_TEMPLATE,
             l10n_util::GetStringUTF16(options.summary_resource_id),
             l10n_util::GetStringUTF16(platform_string_id)));
   }
 #endif  // defined(OS_MACOSX) || defined(OS_WIN)
 
   if (options.suggestions & SUGGEST_RELOAD) {
-    DictionaryValue* suggest_reload = new DictionaryValue;
-    suggest_reload->SetString("msg",
-        l10n_util::GetStringUTF16(IDS_ERRORPAGES_SUGGESTION_RELOAD));
-    suggest_reload->SetString("reloadUrl", failed_url_string);
-    error_strings->Set("suggestionsReload", suggest_reload);
+    DictionaryValue* reload_button = new DictionaryValue;
+    reload_button->SetString("msg",
+        l10n_util::GetStringUTF16(IDS_ERRORPAGES_BUTTON_RELOAD));
+    reload_button->SetString("reloadUrl", failed_url_string);
+    error_strings->Set("reload", reload_button);
   }
 
   if (options.suggestions & SUGGEST_HOSTNAME) {
     // Only show the "Go to hostname" suggestion if the failed_url has a path.
     if (std::string() == failed_url.path()) {
       DictionaryValue* suggest_home_page = new DictionaryValue;
       suggest_home_page->SetString("suggestionsHomepageMsg",
           l10n_util::GetStringUTF16(IDS_ERRORPAGES_SUGGESTION_HOMEPAGE));
       string16 homepage(ASCIIToUTF16(failed_url.GetWithEmptyPath().spec()));
       // URLs are always LTR.
@@ skipping 169 matching lines @@
 #if defined(OS_CHROMEOS)
   GURL learn_more_url(kAppWarningLearnMoreUrl);
   DictionaryValue* suggest_learn_more = new DictionaryValue();
   suggest_learn_more->SetString("msg",
                                 l10n_util::GetStringUTF16(
                                     IDS_ERRORPAGES_SUGGESTION_LEARNMORE));
   suggest_learn_more->SetString("learnMoreUrl", learn_more_url.spec());
   error_strings->Set("suggestionsLearnMore", suggest_learn_more);
 #endif  // defined(OS_CHROMEOS)
 }