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 bd618c4637b6dcb5aa5f7edffd1f1f441bcec950..e8fdedd03724ce778668fbfdbab9d7ece0241ce3 100644 |
| --- a/content/browser/frame_host/render_frame_host_impl.cc |
| +++ b/content/browser/frame_host/render_frame_host_impl.cc |
| @@ -581,16 +581,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, nullptr); |
|
Charlie Reis
2014/12/06 00:18:50
Let's pass GetSiteInstance().
lfg
2014/12/08 20:45:33
Done.
|
| } |
| void RenderFrameHostImpl::OnDocumentOnLoadCompleted() { |
| @@ -1268,8 +1260,16 @@ 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* site_instance) { |
| + 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, site_instance, params.referrer, params.disposition, |
| + params.should_replace_current_entry, params.user_gesture); |
| } |
| void RenderFrameHostImpl::Stop() { |