Display DNS probe results.

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/strings/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 "chrome/common/extensions/manifest_handlers/icons_handler.h"
+#include "chrome/common/net/net_error_info.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/public/platform/WebURLError.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/webui/web_ui_util.h"
 #include "webkit/glue/webkit_glue.h"
 
@@ skipping 334 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 LocalizedErrorMap dns_probe_error_options[] = {

[mmenke, 2013/06/12 19:17:12]

Hmm...Naming scheme used for these is wrong, for consts.  Not a big change, but
this CL is already kinda huge without fixing that.

[Deprecated (see juliatuttle), 2013/06/13 14:37:04]

It is, but so is the one used for the other const arrays.

[mmenke, 2013/06/13 15:00:12]

Sorry, my comment about fixing that meant fixing it for the others, too (Which I
would suggest in this CL, if it weren't so big already - best to keep to what
matters).

+  {chrome_common_net::DNS_PROBE_POSSIBLE,
+   IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
+   IDS_ERRORPAGES_HEADING_NOT_AVAILABLE,
+   IDS_ERRORPAGES_SUMMARY_DNS_PROBE_RUNNING,
+   IDS_ERRORPAGES_DETAILS_DNS_PROBE_RUNNING,
+   SUGGEST_RELOAD,
+  },
+
+  // DNS_PROBE_NOT_RUN is not here; NetErrorHelper will restore the original
+  // error, which might be one of several DNS-related errors.
+
+  {chrome_common_net::DNS_PROBE_STARTED,
+   IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
+   IDS_ERRORPAGES_HEADING_NOT_AVAILABLE,
+   IDS_ERRORPAGES_SUMMARY_DNS_PROBE_RUNNING,
+   IDS_ERRORPAGES_DETAILS_DNS_PROBE_RUNNING,
+   // Include SUGGEST_RELOAD so the More button doesn't jump when we update.
+   SUGGEST_RELOAD,
+  },
+
+  // DNS_PROBE_FINISHED_UNKNOWN is not here; NetErrorHelper will restore the
+  // original error, which might be one of several DNS-related errors.
+
+  {chrome_common_net::DNS_PROBE_FINISHED_NO_INTERNET,
+   IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
+   IDS_ERRORPAGES_HEADING_NOT_AVAILABLE,
+   IDS_ERRORPAGES_SUMMARY_INTERNET_DISCONNECTED,
+   IDS_ERRORPAGES_DETAILS_INTERNET_DISCONNECTED,
+   SUGGEST_RELOAD | SUGGEST_CHECK_CONNECTION | SUGGEST_FIREWALL_CONFIG,
+  },
+  {chrome_common_net::DNS_PROBE_FINISHED_BAD_CONFIG,
+   IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
+   IDS_ERRORPAGES_HEADING_NOT_AVAILABLE,
+   IDS_ERRORPAGES_SUMMARY_NAME_NOT_RESOLVED,
+   IDS_ERRORPAGES_DETAILS_NAME_NOT_RESOLVED,
+   SUGGEST_RELOAD | SUGGEST_DNS_CONFIG | SUGGEST_FIREWALL_CONFIG,
+  },
+  {chrome_common_net::DNS_PROBE_FINISHED_NXDOMAIN,
+   IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
+   IDS_ERRORPAGES_HEADING_NOT_AVAILABLE,
+   IDS_ERRORPAGES_SUMMARY_NAME_NOT_RESOLVED,
+   IDS_ERRORPAGES_DETAILS_NAME_NOT_RESOLVED,
+   SUGGEST_RELOAD,
+  },
+};
+
 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;
 }
 
 const LocalizedErrorMap* LookupErrorMap(const std::string& error_domain,
                                         int error_code, bool is_post) {
   if (error_domain == net::kErrorDomain) {
     // Display a different page in the special case of navigating through the
     // history to an uncached page created by a POST.
     if (is_post && error_code == net::ERR_CACHE_MISS)
       return &repost_error;
     return FindErrorMapInArray(net_error_options,
                                arraysize(net_error_options),
                                error_code);
   } else if (error_domain == LocalizedError::kHttpErrorDomain) {
     return FindErrorMapInArray(http_error_options,
                                arraysize(http_error_options),
                                error_code);
+  } else if (error_domain == chrome_common_net::kDnsProbeErrorDomain) {
+    return FindErrorMapInArray(dns_probe_error_options,
+                               arraysize(dns_probe_error_options),
+                               error_code);

[mmenke, 2013/06/12 19:17:12]

We should DCHECK that this succeeds.

[Deprecated (see juliatuttle), 2013/06/13 14:37:04]

Done.

   } else {
     NOTREACHED();
     return NULL;
   }
 }
 
 bool LocaleIsRTL() {
 #if defined(TOOLKIT_GTK)
   // base::i18n::IsRTL() uses the GTK text direction, which doesn't work within
   // the renderer sandbox.
@@ skipping 89 matching lines @@
         "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 if (error_domain == chrome_common_net::kDnsProbeErrorDomain) {
+    std::string ascii_error_string =
+        chrome_common_net::DnsProbeStatusToString(error_code);
+    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));
 
   base::ListValue* suggestions = new base::ListValue();
 
   // Platform specific instructions for diagnosing network issues on OSX and
@@ skipping 224 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_BODY));
   suggest_learn_more->SetString("learnMoreUrl", learn_more_url.spec());
   error_strings->Set("suggestionsLearnMore", suggest_learn_more);
 #endif  // defined(OS_CHROMEOS)
 }