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

Unified Diff: chrome/common/localized_error.cc

Issue 1277213003: Move DNS functions from net_error_info.h into error_page namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 5 years, 4 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
« no previous file with comments | « chrome/browser/net/net_error_tab_helper.cc ('k') | chrome/renderer/net/net_error_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/localized_error.cc
diff --git a/chrome/common/localized_error.cc b/chrome/common/localized_error.cc
index 2de84acd1c9ae9b7e16b73068116c521aa34dbaa..867867eef9ef02c8f4f86bfa9108a54213b7e784 100644
--- a/chrome/common/localized_error.cc
+++ b/chrome/common/localized_error.cc
@@ -473,7 +473,7 @@ const LocalizedErrorMap* LookupErrorMap(const std::string& error_domain,
return FindErrorMapInArray(http_error_options,
arraysize(http_error_options),
error_code);
- } else if (error_domain == chrome_common_net::kDnsProbeErrorDomain) {
+ } else if (error_domain == error_page::kDnsProbeErrorDomain) {
const LocalizedErrorMap* map =
FindErrorMapInArray(dns_probe_error_options,
arraysize(dns_probe_error_options),
@@ -503,7 +503,7 @@ const char* GetIconClassForError(const std::string& error_domain,
if ((error_code == net::ERR_INTERNET_DISCONNECTED &&
error_domain == net::kErrorDomain) ||
(error_code == chrome_common_net::DNS_PROBE_FINISHED_NO_INTERNET &&
- error_domain == chrome_common_net::kDnsProbeErrorDomain))
+ error_domain == error_page::kDnsProbeErrorDomain))
return "icon-offline";
return "icon-generic";
@@ -615,9 +615,9 @@ void LocalizedError::GetStrings(int error_code,
if (error_domain == net::kErrorDomain) {
// Non-internationalized error string, for debugging Chrome itself.
error_string = base::ASCIIToUTF16(net::ErrorToShortString(error_code));
- } else if (error_domain == chrome_common_net::kDnsProbeErrorDomain) {
+ } else if (error_domain == error_page::kDnsProbeErrorDomain) {
std::string ascii_error_string =
- chrome_common_net::DnsProbeStatusToString(error_code);
+ error_page::DnsProbeStatusToString(error_code);
error_string = base::ASCIIToUTF16(ascii_error_string);
} else {
DCHECK_EQ(LocalizedError::kHttpErrorDomain, error_domain);
« no previous file with comments | « chrome/browser/net/net_error_tab_helper.cc ('k') | chrome/renderer/net/net_error_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698