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

Unified Diff: chrome/browser/ui/toolbar/encoding_menu_controller.cc

Issue 5990008: Remove wstring from l10n_util. Part 1.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 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
Index: chrome/browser/ui/toolbar/encoding_menu_controller.cc
===================================================================
--- chrome/browser/ui/toolbar/encoding_menu_controller.cc (revision 70069)
+++ chrome/browser/ui/toolbar/encoding_menu_controller.cc (working copy)
@@ -130,10 +130,9 @@
std::vector<CharacterEncoding::EncodingInfo>::const_iterator it;
for (it = encodings->begin(); it != encodings->end(); ++it) {
if (it->encoding_id) {
- std::wstring encoding = it->encoding_display_name;
+ string16 encoding = it->encoding_display_name;
base::i18n::AdjustStringForLocaleDirection(&encoding);
- menuItems->push_back(EncodingMenuItem(it->encoding_id,
- WideToUTF16(encoding)));
+ menuItems->push_back(EncodingMenuItem(it->encoding_id, encoding));
} else {
menuItems->push_back(separator);
}
« chrome/browser/language_combobox_model.cc ('K') | « chrome/browser/language_combobox_model.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698