diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-04 22:23:40 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-04 22:23:40 +0000 |
| commit | 41fc0320689c888625b5f13b5540a85590d6f830 (patch) | |
| tree | 121dc85682d85da5eb8ff3ef645985a9bb61d635 /chrome/browser/gtk/options | |
| parent | fe2c7f0cb1d2513e357f3c840bb1aa00739aafdf (diff) | |
| download | chromium_src-41fc0320689c888625b5f13b5540a85590d6f830.zip chromium_src-41fc0320689c888625b5f13b5540a85590d6f830.tar.gz chromium_src-41fc0320689c888625b5f13b5540a85590d6f830.tar.bz2 | |
Convert std::wstring encoding names to std::string in a bunch of files.
BUG=8647 (http://crbug.com/8647)
TEST=run unit_tests.exe and ui_tests.exe
Original patch by Thiago Farina <thiago.farina@gmail.com> at
http://codereview.chromium.org/179057/show
Some linux related fixes by me.
Review URL: http://codereview.chromium.org/192017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25529 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/options')
| -rw-r--r-- | chrome/browser/gtk/options/fonts_page_gtk.cc | 7 |
1 files changed, 4 insertions, 3 deletions
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))); } |