diff options
Diffstat (limited to 'chrome/browser/encoding_menu_controller_delegate.cc')
| -rw-r--r-- | chrome/browser/encoding_menu_controller_delegate.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/chrome/browser/encoding_menu_controller_delegate.cc b/chrome/browser/encoding_menu_controller_delegate.cc index 8ebd8d8..7892920 100644 --- a/chrome/browser/encoding_menu_controller_delegate.cc +++ b/chrome/browser/encoding_menu_controller_delegate.cc @@ -53,9 +53,11 @@ bool EncodingMenuControllerDelegate::IsItemChecked(int id) const { TabContents* current_tab = browser_->GetSelectedTabContents(); if (!current_tab) return false; - std::wstring encoding_name = current_tab->GetEncoding(); - if (encoding_name.empty()) - encoding_name = profile->GetPrefs()->GetString(prefs::kDefaultCharset); + std::string encoding_name = current_tab->GetEncoding(); + if (encoding_name.empty()) { + encoding_name = WideToUTF8( + profile->GetPrefs()->GetString(prefs::kDefaultCharset)); + } switch (id) { case IDC_ENCODING_AUTO_DETECT: return profile->GetPrefs()->GetBoolean( |