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

Unified Diff: chrome_frame/simple_resource_loader.cc

Issue 113143006: Add base:: to string16 in chrome_frame/. (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/registry_list_preferences_holder.cc ('k') | chrome_frame/test/chrome_frame_test_utils.cc » ('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 e6d5c6c3c2ea980f7bb4f2e5b17961f362ff691c..ad38feee0df6ae1751bd947134a2ca3b2f67b7a5 100644
--- a/chrome_frame/simple_resource_loader.cc
+++ b/chrome_frame/simple_resource_loader.cc
@@ -245,10 +245,10 @@ std::wstring SimpleResourceLoader::GetLocalizedResource(int message_id) {
}
// Data pack encodes strings as either UTF8 or UTF16.
- string16 msg;
+ base::string16 msg;
if (data_pack_->GetTextEncodingType() == ui::DataPack::UTF16) {
- msg = string16(reinterpret_cast<const char16*>(data.data()),
- data.length() / 2);
+ msg = base::string16(reinterpret_cast<const char16*>(data.data()),
+ data.length() / 2);
} else if (data_pack_->GetTextEncodingType() == ui::DataPack::UTF8) {
msg = UTF8ToUTF16(data);
}
« no previous file with comments | « chrome_frame/registry_list_preferences_holder.cc ('k') | chrome_frame/test/chrome_frame_test_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698