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

Unified Diff: chrome_frame/simple_resource_loader.cc

Issue 112433004: Update uses of UTF conversions in chrome_frame/, chromeos/, components/ 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_frame/protocol_sink_wrap.cc ('k') | chrome_frame/test/chrome_frame_automation_mock.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/simple_resource_loader.cc
diff --git a/chrome_frame/simple_resource_loader.cc b/chrome_frame/simple_resource_loader.cc
index ad38feee0df6ae1751bd947134a2ca3b2f67b7a5..b6e21e6400c808f72b2d389a9b985ac4e8114500 100644
--- a/chrome_frame/simple_resource_loader.cc
+++ b/chrome_frame/simple_resource_loader.cc
@@ -132,7 +132,8 @@ void SimpleResourceLoader::GetPreferredLanguages(
}
// Use the base i18n routines (i.e., ICU) as a last, best hope for something
// meaningful for the user.
- PushBackWithFallbackIfAbsent(ASCIIToWide(base::i18n::GetConfiguredLocale()),
+ PushBackWithFallbackIfAbsent(base::ASCIIToWide(
+ base::i18n::GetConfiguredLocale()),
language_tags);
}
@@ -250,7 +251,7 @@ std::wstring SimpleResourceLoader::GetLocalizedResource(int message_id) {
msg = base::string16(reinterpret_cast<const char16*>(data.data()),
data.length() / 2);
} else if (data_pack_->GetTextEncodingType() == ui::DataPack::UTF8) {
- msg = UTF8ToUTF16(data);
+ msg = base::UTF8ToUTF16(data);
}
return msg;
}
« no previous file with comments | « chrome_frame/protocol_sink_wrap.cc ('k') | chrome_frame/test/chrome_frame_automation_mock.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698