2 files changed, 6 insertions, 5 deletions
diff --git a/chrome/browser/gtk/browser_toolbar_gtk.cc b/chrome/browser/gtk/browser_toolbar_gtk.cc
index 808e5c2..ec25a9f 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);
     }
diff --git a/chrome/browser/gtk/options/fonts_page_gtk.cc b/chrome/browser/gtk/options/fonts_page_gtk.cc
index 3f4941f..7fa7285 100644
--- a/chrome/browser/gtk/options/fonts_page_gtk.cc
+++ b/chrome/browser/gtk/options/fonts_page_gtk.cc
@@ -140,7 +140,8 @@ void FontsPageGtk::NotifyPrefChanged(const std::wstring* pref_name) {
           fixed_width_size_.GetValue()).c_str());
   }
   if (!pref_name || *pref_name == prefs::kDefaultCharset) {
-    const std::wstring current_encoding = default_encoding_.GetValue();
+    const std::string current_encoding =
+        WideToASCII(default_encoding_.GetValue());
     for (size_t i = 0; i < sorted_encoding_list_.size(); i++) {
       if (CharacterEncoding::GetCanonicalEncodingNameByCommandId(
           sorted_encoding_list_[i].encoding_id) == current_encoding) {
@@ -201,6 +202,6 @@ void FontsPageGtk::OnDefaultEncodingChanged(GtkComboBox* combo_box,
     return;
   }
   fonts_page->default_encoding_.SetValue(
-      CharacterEncoding::GetCanonicalEncodingNameByCommandId(
-          fonts_page->sorted_encoding_list_[index].encoding_id));
+      ASCIIToWide(CharacterEncoding::GetCanonicalEncodingNameByCommandId(
+          fonts_page->sorted_encoding_list_[index].encoding_id)));
 }