Chromium Code Reviews| Index: content/browser/frame_host/render_frame_host_impl.cc |
| diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc |
| index 8807340a3ba21f27905707c46ef4fbd788ad706c..482c874ed4a7dd1adeac3cb59534917423cf2df4 100644 |
| --- a/content/browser/frame_host/render_frame_host_impl.cc |
| +++ b/content/browser/frame_host/render_frame_host_impl.cc |
| @@ -582,16 +582,8 @@ void RenderFrameHostImpl::OnFrameFocused() { |
| frame_tree_->SetFocusedFrame(frame_tree_node_); |
| } |
| -void RenderFrameHostImpl::OnOpenURL( |
| - const FrameHostMsg_OpenURL_Params& params) { |
| - GURL validated_url(params.url); |
| - GetProcess()->FilterURL(false, &validated_url); |
| - |
| - TRACE_EVENT1("navigation", "RenderFrameHostImpl::OnOpenURL", |
| - "url", validated_url.possibly_invalid_spec()); |
| - frame_tree_node_->navigator()->RequestOpenURL( |
| - this, validated_url, params.referrer, params.disposition, |
| - params.should_replace_current_entry, params.user_gesture); |
| +void RenderFrameHostImpl::OnOpenURL(const FrameHostMsg_OpenURL_Params& params) { |
| + OpenURL(params, GetSiteInstance()); |
| } |
| void RenderFrameHostImpl::OnDocumentOnLoadCompleted() { |
| @@ -1281,8 +1273,17 @@ void RenderFrameHostImpl::NavigateToURL(const GURL& url) { |
| Navigate(params); |
| } |
| -void RenderFrameHostImpl::OpenURL(const FrameHostMsg_OpenURL_Params& params) { |
| - OnOpenURL(params); |
| +void RenderFrameHostImpl::OpenURL(const FrameHostMsg_OpenURL_Params& params, |
| + SiteInstance* source_site_instance) { |
| + GURL validated_url(params.url); |
| + GetProcess()->FilterURL(false, &validated_url); |
| + |
| + TRACE_EVENT1("navigation", "RenderFrameHostImpl::OnOpenURL", "url", |
|
nasko
2014/12/11 01:14:44
nit: The method is no longer called OnOpenURL, so
lfg
2014/12/11 23:55:24
Done.
|
| + validated_url.possibly_invalid_spec()); |
| + frame_tree_node_->navigator()->RequestOpenURL( |
| + this, validated_url, source_site_instance, params.referrer, |
| + params.disposition, params.should_replace_current_entry, |
| + params.user_gesture); |
| } |
| void RenderFrameHostImpl::Stop() { |