diff options
| author | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-12 23:08:30 +0000 |
|---|---|---|
| committer | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-12 23:08:30 +0000 |
| commit | e38f40150dac6e0af08e3cdcfb1e502a2223c87c (patch) | |
| tree | 3b31c4c506ac390d712921ae35acad89f7afd5d7 /chrome/browser/encoding_menu_controller_delegate.cc | |
| parent | 5baa03fdfe3a13d4102a819fb3e653f1559b5259 (diff) | |
| download | chromium_src-e38f40150dac6e0af08e3cdcfb1e502a2223c87c.zip chromium_src-e38f40150dac6e0af08e3cdcfb1e502a2223c87c.tar.gz chromium_src-e38f40150dac6e0af08e3cdcfb1e502a2223c87c.tar.bz2 | |
Revert the change that fixed the encoding when viewing source in subframes.
This makes view source for some pages (for example Google Reader) not work
properly. I speculate that telling WebKit to change the encoding (which causes
a reload) right after starting the real load makes it confused.
Review URL: http://codereview.chromium.org/3022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2143 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, 3 insertions, 5 deletions
diff --git a/chrome/browser/encoding_menu_controller_delegate.cc b/chrome/browser/encoding_menu_controller_delegate.cc index c15b00c..d7a7bc8 100644 --- a/chrome/browser/encoding_menu_controller_delegate.cc +++ b/chrome/browser/encoding_menu_controller_delegate.cc @@ -28,11 +28,9 @@ bool EncodingMenuControllerDelegate::IsItemChecked(int id) const { TabContents* current_tab = browser_->GetSelectedTabContents(); if (!current_tab) return false; - std::string encoding_name = current_tab->GetEncoding(); - if (encoding_name.empty()) { - encoding_name = WideToUTF8( - profile->GetPrefs()->GetString(prefs::kDefaultCharset)); - } + std::wstring encoding_name = current_tab->GetEncoding(); + if (encoding_name.empty()) + encoding_name = profile->GetPrefs()->GetString(prefs::kDefaultCharset); switch (id) { case IDC_ENCODING_AUTO_DETECT: return profile->GetPrefs()->GetBoolean( |