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

Unified Diff: chrome/common/localized_error.cc

Issue 93793010: Update uses of UTF conversions in chrome/common to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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/common/importer/ie_importer_test_registry_overrider_win.cc ('k') | chrome/common/logging_chrome.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 86280a5aa4cbf686262c01ce758644abc7aa936e..d85428cb382c5ef3d37189afc80d2eee442bfbc4 100644
--- a/chrome/common/localized_error.cc
+++ b/chrome/common/localized_error.cc
@@ -574,11 +574,11 @@ void LocalizedError::GetStrings(int error_code,
std::string ascii_error_string = net::ErrorToString(error_code);
// Remove the leading "net::" from the returned string.
base::RemoveChars(ascii_error_string, "net:", &ascii_error_string);
- error_string = ASCIIToUTF16(ascii_error_string);
+ error_string = base::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);
+ error_string = base::ASCIIToUTF16(ascii_error_string);
} else {
DCHECK_EQ(LocalizedError::kHttpErrorDomain, error_domain);
error_string = base::IntToString16(error_code);
@@ -795,7 +795,7 @@ void LocalizedError::GetAppErrorStrings(
bool rtl = LocaleIsRTL();
error_strings->SetString("textdirection", rtl ? "rtl" : "ltr");
- base::string16 failed_url(ASCIIToUTF16(display_url.spec()));
+ base::string16 failed_url(base::ASCIIToUTF16(display_url.spec()));
// URLs are always LTR.
if (rtl)
base::i18n::WrapStringWithLTRFormatting(&failed_url);
« no previous file with comments | « chrome/common/importer/ie_importer_test_registry_overrider_win.cc ('k') | chrome/common/logging_chrome.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698