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/render_view_context_menu_controller.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/render_view_context_menu_controller.cc')
| -rw-r--r-- | chrome/browser/render_view_context_menu_controller.cc | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/chrome/browser/render_view_context_menu_controller.cc b/chrome/browser/render_view_context_menu_controller.cc index d84834b..1a97ec3 100644 --- a/chrome/browser/render_view_context_menu_controller.cc +++ b/chrome/browser/render_view_context_menu_controller.cc @@ -42,15 +42,6 @@ RenderViewContextMenuController::~RenderViewContextMenuController() { /////////////////////////////////////////////////////////////////////////////// // Controller methods -void RenderViewContextMenuController::OpenURLWithOverrideEncoding( - const GURL& url, - WindowOpenDisposition disposition, - PageTransition::Type transition, - const std::string& override_encoding) { - source_web_contents_->OpenURLWithOverrideEncoding(url, disposition, - transition, override_encoding); -} - void RenderViewContextMenuController::OpenURL( const GURL& url, WindowOpenDisposition disposition, @@ -282,10 +273,8 @@ void RenderViewContextMenuController::ExecuteCommand(int id) { break; case IDS_CONTENT_CONTEXT_VIEWPAGESOURCE: - OpenURLWithOverrideEncoding( - GURL("view-source:" + params_.page_url.spec()), - NEW_FOREGROUND_TAB, PageTransition::GENERATED, - source_web_contents_->GetEncoding()); + OpenURL(GURL("view-source:" + params_.page_url.spec()), + NEW_FOREGROUND_TAB, PageTransition::GENERATED); break; case IDS_CONTENT_CONTEXT_INSPECTELEMENT: @@ -320,10 +309,8 @@ void RenderViewContextMenuController::ExecuteCommand(int id) { break; case IDS_CONTENT_CONTEXT_VIEWFRAMESOURCE: - OpenURLWithOverrideEncoding( - GURL("view-source:" + params_.frame_url.spec()), - NEW_FOREGROUND_TAB, PageTransition::GENERATED, - params_.frame_encoding); + OpenURL(GURL("view-source:" + params_.frame_url.spec()), + NEW_FOREGROUND_TAB, PageTransition::GENERATED); break; case IDS_CONTENT_CONTEXT_VIEWFRAMEINFO: |