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

Unified Diff: chrome/browser/gtk/browser_toolbar_gtk.cc

Issue 192017: Convert std::wstring encoding names to std::string in a bunch of files. (Closed)
Patch Set: mac and linux fixes Created 11 years, 3 months 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/browser/encoding_menu_controller_unittest.cc ('k') | chrome/browser/gtk/options/fonts_page_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/gtk/browser_toolbar_gtk.cc
diff --git a/chrome/browser/gtk/browser_toolbar_gtk.cc b/chrome/browser/gtk/browser_toolbar_gtk.cc
index 808e5c2625155b8798616a1eda8cd181f3df5a72..ec25a9f347851c397f3382a2426ed4c2ead3a88e 100644
--- a/chrome/browser/gtk/browser_toolbar_gtk.cc
+++ b/chrome/browser/gtk/browser_toolbar_gtk.cc
@@ -119,13 +119,13 @@ static MenuGtk* BuildEncodingsMenu(Profile* profile,
items.begin();
i != items.end(); ++i) {
if (i == items.begin()) {
- menu->AppendCheckMenuItemWithLabel(i->first, WideToUTF8(i->second));
+ menu->AppendCheckMenuItemWithLabel(i->first, UTF16ToUTF8(i->second));
} else if (i->first == 0) {
menu->AppendSeparator();
} else {
GtkWidget* item =
gtk_radio_menu_item_new_with_label(radio_group,
- WideToUTF8(i->second).c_str());
+ UTF16ToUTF8(i->second).c_str());
radio_group = gtk_radio_menu_item_get_group(GTK_RADIO_MENU_ITEM(item));
menu->AppendMenuItem(i->first, item);
}
« no previous file with comments | « chrome/browser/encoding_menu_controller_unittest.cc ('k') | chrome/browser/gtk/options/fonts_page_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698