diff options
| author | jnd@google.com <jnd@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-21 02:58:09 +0000 |
|---|---|---|
| committer | jnd@google.com <jnd@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-21 02:58:09 +0000 |
| commit | 1a3ebe10ead2ca99d2beb45b9ec65a2863406184 (patch) | |
| tree | b1c8b11cc0a32e1f561362ecee1b488bf7d91b15 /chrome/browser/encoding_menu_controller_delegate.cc | |
| parent | aef050626d6412bffa292cbfcee23107cadc4b5d (diff) | |
| download | chromium_src-1a3ebe10ead2ca99d2beb45b9ec65a2863406184.zip chromium_src-1a3ebe10ead2ca99d2beb45b9ec65a2863406184.tar.gz chromium_src-1a3ebe10ead2ca99d2beb45b9ec65a2863406184.tar.bz2 | |
As Brett pointed it out, We normally use 8-bit for encoding names since they're always ASCII. Plus, wstrings will also be 32-bit characters on Linux and Mac, which is expensive. So I make this CL by using std::string instead of std::wstring every time you have an encoding name.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1144 0039d316-1c4b-4281-b951-d872f2087c98
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( |