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); |
} |