diff options
Diffstat (limited to 'chrome/browser/views/options/fonts_page_view.cc')
| -rw-r--r-- | chrome/browser/views/options/fonts_page_view.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/views/options/fonts_page_view.cc b/chrome/browser/views/options/fonts_page_view.cc index 797dc35..09a82cf 100644 --- a/chrome/browser/views/options/fonts_page_view.cc +++ b/chrome/browser/views/options/fonts_page_view.cc @@ -55,8 +55,7 @@ class DefaultEncodingComboboxModel : public ChromeViews::ComboBox::Model { std::wstring GetEncodingCharsetByIndex(int index) { DCHECK(index >= 0 && canonical_encoding_names_length_ > index); - return UTF8ToWide( - CharacterEncoding::GetCanonicalEncodingNameByIndex(index)); + return CharacterEncoding::GetCanonicalEncodingNameByIndex(index); } int GetSelectedEncodingIndex(Profile* profile) { @@ -64,8 +63,7 @@ class DefaultEncodingComboboxModel : public ChromeViews::ComboBox::Model { current_encoding_string.Init(prefs::kDefaultCharset, profile->GetPrefs(), NULL); - const std::string current_encoding = - WideToUTF8(current_encoding_string.GetValue()); + const std::wstring current_encoding = current_encoding_string.GetValue(); for (int i = 0; i < canonical_encoding_names_length_; i++) { if (CharacterEncoding::GetCanonicalEncodingNameByIndex(i) == current_encoding) |