OLD | NEW |
---|---|
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/renderer/render_frame_impl.h" | 5 #include "content/renderer/render_frame_impl.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
(...skipping 1847 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1858 void RenderFrameImpl::loadURLExternally( | 1858 void RenderFrameImpl::loadURLExternally( |
1859 blink::WebLocalFrame* frame, | 1859 blink::WebLocalFrame* frame, |
1860 const blink::WebURLRequest& request, | 1860 const blink::WebURLRequest& request, |
1861 blink::WebNavigationPolicy policy, | 1861 blink::WebNavigationPolicy policy, |
1862 const blink::WebString& suggested_name) { | 1862 const blink::WebString& suggested_name) { |
1863 DCHECK(!frame_ || frame_ == frame); | 1863 DCHECK(!frame_ || frame_ == frame); |
1864 Referrer referrer(RenderViewImpl::GetReferrerFromRequest(frame, request)); | 1864 Referrer referrer(RenderViewImpl::GetReferrerFromRequest(frame, request)); |
1865 if (policy == blink::WebNavigationPolicyDownload) { | 1865 if (policy == blink::WebNavigationPolicyDownload) { |
1866 render_view_->Send(new ViewHostMsg_DownloadUrl(render_view_->GetRoutingID(), | 1866 render_view_->Send(new ViewHostMsg_DownloadUrl(render_view_->GetRoutingID(), |
1867 request.url(), referrer, | 1867 request.url(), referrer, |
1868 suggested_name, false)); | 1868 suggested_name)); |
1869 } else if (policy == blink::WebNavigationPolicyDownloadTo) { | |
Ken Russell (switch to Gerrit)
2014/09/04 00:23:26
Per my comments on your other CL, I think this cod
zino
2014/09/05 03:47:47
ditto.
| |
1870 render_view_->Send(new ViewHostMsg_DownloadUrl(render_view_->GetRoutingID(), | |
1871 request.url(), referrer, | |
1872 suggested_name, true)); | |
1873 } else { | 1869 } else { |
1874 OpenURL(frame, request.url(), referrer, policy); | 1870 OpenURL(frame, request.url(), referrer, policy); |
1875 } | 1871 } |
1876 } | 1872 } |
1877 | 1873 |
1878 blink::WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation( | 1874 blink::WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation( |
1879 const NavigationPolicyInfo& info) { | 1875 const NavigationPolicyInfo& info) { |
1880 DCHECK(!frame_ || frame_ == info.frame); | 1876 DCHECK(!frame_ || frame_ == info.frame); |
1881 return DecidePolicyForNavigation(this, info); | 1877 return DecidePolicyForNavigation(this, info); |
1882 } | 1878 } |
(...skipping 1966 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
3849 | 3845 |
3850 #if defined(ENABLE_BROWSER_CDMS) | 3846 #if defined(ENABLE_BROWSER_CDMS) |
3851 RendererCdmManager* RenderFrameImpl::GetCdmManager() { | 3847 RendererCdmManager* RenderFrameImpl::GetCdmManager() { |
3852 if (!cdm_manager_) | 3848 if (!cdm_manager_) |
3853 cdm_manager_ = new RendererCdmManager(this); | 3849 cdm_manager_ = new RendererCdmManager(this); |
3854 return cdm_manager_; | 3850 return cdm_manager_; |
3855 } | 3851 } |
3856 #endif // defined(ENABLE_BROWSER_CDMS) | 3852 #endif // defined(ENABLE_BROWSER_CDMS) |
3857 | 3853 |
3858 } // namespace content | 3854 } // namespace content |
OLD | NEW |