summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views/constrained_window_impl.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/views/constrained_window_impl.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/views/constrained_window_impl.cc')
-rw-r--r--chrome/browser/views/constrained_window_impl.cc10
1 files changed, 4 insertions, 6 deletions
diff --git a/chrome/browser/views/constrained_window_impl.cc b/chrome/browser/views/constrained_window_impl.cc
index 77b1854..de02b41 100644
--- a/chrome/browser/views/constrained_window_impl.cc
+++ b/chrome/browser/views/constrained_window_impl.cc
@@ -985,12 +985,10 @@ void ConstrainedWindowImpl::ActivateContents(TabContents* contents) {
ActivateConstrainedWindow();
}
-void ConstrainedWindowImpl::OpenURLFromTab(
- TabContents* source,
- const GURL& url,
- WindowOpenDisposition disposition,
- PageTransition::Type transition,
- const std::string& override_encoding) {
+void ConstrainedWindowImpl::OpenURLFromTab(TabContents* source,
+ const GURL& url,
+ WindowOpenDisposition disposition,
+ PageTransition::Type transition) {
// We ignore source right now.
owner_->OpenURL(this, url, disposition, transition);
}