summaryrefslogtreecommitdiffstats
path: root/chrome/browser/render_view_host.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/render_view_host.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/render_view_host.cc')
-rw-r--r--chrome/browser/render_view_host.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/render_view_host.cc b/chrome/browser/render_view_host.cc
index f4fc34b..4f02aaca 100644
--- a/chrome/browser/render_view_host.cc
+++ b/chrome/browser/render_view_host.cc
@@ -327,7 +327,7 @@ void RenderViewHost::AlterTextSize(text_zoom::TextSize size) {
Send(new ViewMsg_AlterTextSize(routing_id_, size));
}
-void RenderViewHost::SetPageEncoding(const std::string& encoding_name) {
+void RenderViewHost::SetPageEncoding(const std::wstring& encoding_name) {
Send(new ViewMsg_SetPageEncoding(routing_id_, encoding_name));
}
@@ -830,7 +830,7 @@ void RenderViewHost::OnMsgUpdateTitle(int32 page_id,
delegate_->UpdateTitle(this, page_id, title);
}
-void RenderViewHost::OnMsgUpdateEncoding(const std::string& encoding_name) {
+void RenderViewHost::OnMsgUpdateEncoding(const std::wstring& encoding_name) {
delegate_->UpdateEncoding(this, encoding_name);
}