diff options
| author | jungshik@google.com <jungshik@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-22 20:23:52 +0000 |
|---|---|---|
| committer | jungshik@google.com <jungshik@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-22 20:23:52 +0000 |
| commit | 50dd8bb2e19a67adcef0f3bfbabd935a4e94de3c (patch) | |
| tree | b6880001fbf5fc69c2c7417ca26682d3629062ed /chrome/browser/encoding_menu_controller_delegate.cc | |
| parent | a74c9d049e625be4b542697e1a77c10364dc7cd2 (diff) | |
| download | chromium_src-50dd8bb2e19a67adcef0f3bfbabd935a4e94de3c.zip chromium_src-50dd8bb2e19a67adcef0f3bfbabd935a4e94de3c.tar.gz chromium_src-50dd8bb2e19a67adcef0f3bfbabd935a4e94de3c.tar.bz2 | |
Make the character encoding override work again. There are two other bugs with character encoding override, but it seems that it's better to fix them separately.
BUG=3315
Review URL: http://codereview.chromium.org/7647
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3759 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 | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/chrome/browser/encoding_menu_controller_delegate.cc b/chrome/browser/encoding_menu_controller_delegate.cc index 0d5ecb1..3b12114 100644 --- a/chrome/browser/encoding_menu_controller_delegate.cc +++ b/chrome/browser/encoding_menu_controller_delegate.cc @@ -9,7 +9,7 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/character_encoding.h" #include "chrome/browser/profile.h" -#include "chrome/browser/tab_contents.h" +#include "chrome/browser/web_contents.h" #include "chrome/common/l10n_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" @@ -29,9 +29,11 @@ bool EncodingMenuControllerDelegate::IsItemChecked(int id) const { TabContents* current_tab = browser_->GetSelectedTabContents(); if (!current_tab) return false; - std::wstring encoding_name = current_tab->encoding(); - if (encoding_name.empty()) - encoding_name = profile->GetPrefs()->GetString(prefs::kDefaultCharset); + std::wstring encoding; + if (current_tab->AsWebContents()) + encoding = current_tab->AsWebContents()->encoding(); + if (encoding.empty()) + encoding = profile->GetPrefs()->GetString(prefs::kDefaultCharset); switch (id) { case IDC_ENCODING_AUTO_DETECT: return profile->GetPrefs()->GetBoolean( @@ -73,7 +75,7 @@ bool EncodingMenuControllerDelegate::IsItemChecked(int id) const { case IDC_ENCODING_ISO88598: case IDC_ENCODING_WINDOWS1255: case IDC_ENCODING_WINDOWS1258: - return (!encoding_name.empty() && encoding_name == + return (!encoding.empty() && encoding == CharacterEncoding::GetCanonicalEncodingNameByCommandId(id)); default: return false; |