diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-11 18:04:59 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-11 18:04:59 +0000 |
| commit | efce17b6c7af96f3f2db55342b94ce44246cfb36 (patch) | |
| tree | 23c31ea7da9fbf66bda8e8009f1b1c997411672a /chrome/renderer | |
| parent | 9ccb18d691f7f70292ed19a83dc1381f9baeea97 (diff) | |
| download | chromium_src-efce17b6c7af96f3f2db55342b94ce44246cfb36.zip chromium_src-efce17b6c7af96f3f2db55342b94ce44246cfb36.tar.gz chromium_src-efce17b6c7af96f3f2db55342b94ce44246cfb36.tar.bz2 | |
Eliminate some methods.
Removes WebFrame::reportFindInPageSelection since it was only
ever called by WebFrameImpl. Now it is a private method.
Removes WebViewDelegate::DownloadUrl since it can be expressed
using WebFrameClient::loadURLExternally.
R=dglazkov
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/201092
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25987 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
| -rw-r--r-- | chrome/renderer/render_view.cc | 13 | ||||
| -rw-r--r-- | chrome/renderer/render_view.h | 1 |
2 files changed, 6 insertions, 8 deletions
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index 6847563..b50ff26 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -1625,9 +1625,12 @@ void RenderView::willClose(WebFrame* frame) { void RenderView::loadURLExternally( WebFrame* frame, const WebURLRequest& request, WebNavigationPolicy policy) { - OpenURL(request.url(), - GURL(request.httpHeaderField(WebString::fromUTF8("Referer"))), - policy); + GURL referrer(request.httpHeaderField(WebString::fromUTF8("Referer"))); + if (policy == WebKit::WebNavigationPolicyDownload) { + Send(new ViewHostMsg_DownloadUrl(routing_id_, request.url(), referrer)); + } else { + OpenURL(request.url(), referrer, policy); + } } WebNavigationPolicy RenderView::decidePolicyForNavigation( @@ -2660,10 +2663,6 @@ void RenderView::SetTooltipText(WebView* webview, text_direction_hint)); } -void RenderView::DownloadUrl(const GURL& url, const GURL& referrer) { - Send(new ViewHostMsg_DownloadUrl(routing_id_, url, referrer)); -} - void RenderView::UpdateInspectorSettings(const std::wstring& raw_settings) { Send(new ViewHostMsg_UpdateInspectorSettings(routing_id_, raw_settings)); } diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h index 442760e..5b05c99 100644 --- a/chrome/renderer/render_view.h +++ b/chrome/renderer/render_view.h @@ -242,7 +242,6 @@ class RenderView : public RenderWidget, virtual void SetTooltipText(WebView* webview, const std::wstring& tooltip_text, WebKit::WebTextDirection text_direction_hint); - virtual void DownloadUrl(const GURL& url, const GURL& referrer); virtual void UpdateInspectorSettings(const std::wstring& raw_settings); virtual WebDevToolsAgentDelegate* GetWebDevToolsAgentDelegate(); virtual void ReportFindInPageMatchCount(int count, int request_id, |