summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_commands.cc
diff options
context:
space:
mode:
authorbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-12 23:08:30 +0000
committerbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-12 23:08:30 +0000
commite38f40150dac6e0af08e3cdcfb1e502a2223c87c (patch)
tree3b31c4c506ac390d712921ae35acad89f7afd5d7 /chrome/browser/browser_commands.cc
parent5baa03fdfe3a13d4102a819fb3e653f1559b5259 (diff)
downloadchromium_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/browser_commands.cc')
-rw-r--r--chrome/browser/browser_commands.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/browser_commands.cc b/chrome/browser/browser_commands.cc
index 5594f0e..363c6bd 100644
--- a/chrome/browser/browser_commands.cc
+++ b/chrome/browser/browser_commands.cc
@@ -625,7 +625,7 @@ void Browser::ExecuteCommand(int id) {
case IDC_ENCODING_WINDOWS1255:
case IDC_ENCODING_WINDOWS1258: {
UserMetrics::RecordAction(L"OverrideEncoding", profile_);
- const std::string cur_encoding_name =
+ const std::wstring cur_encoding_name =
CharacterEncoding::GetCanonicalEncodingNameByCommandId(id);
TabContents* current_tab = GetSelectedTabContents();
if (!cur_encoding_name.empty() && current_tab)