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 d9327b01b394d38379f1426313c482be02f553c7..b382079742168a8bda69bb542a68f3944508af9b 100644 |
--- a/content/browser/frame_host/render_frame_host_impl.cc |
+++ b/content/browser/frame_host/render_frame_host_impl.cc |
@@ -1004,7 +1004,7 @@ void RenderFrameHostImpl::OnOpenURL(const FrameHostMsg_OpenURL_Params& params) { |
return; |
} |
- OpenURL(params, GetSiteInstance()); |
+ OpenURL(params); |
} |
void RenderFrameHostImpl::OnCancelInitialHistoryLoad() { |
@@ -2353,8 +2353,7 @@ void RenderFrameHostImpl::NavigateToInterstitialURL(const GURL& data_url) { |
} |
} |
-void RenderFrameHostImpl::OpenURL(const FrameHostMsg_OpenURL_Params& params, |
- SiteInstance* source_site_instance) { |
+void RenderFrameHostImpl::OpenURL(const FrameHostMsg_OpenURL_Params& params) { |
Charlie Reis
2016/11/02 17:05:37
Can we combine this with OnOpenURL? Looks like th
alexmos
2016/11/03 06:03:01
Done. Good catch with NavigateNewChildFrame.
|
GURL validated_url(params.url); |
GetProcess()->FilterURL(false, &validated_url); |
@@ -2362,9 +2361,8 @@ void RenderFrameHostImpl::OpenURL(const FrameHostMsg_OpenURL_Params& params, |
validated_url.possibly_invalid_spec()); |
frame_tree_node_->navigator()->RequestOpenURL( |
this, validated_url, params.uses_post, params.resource_request_body, |
- params.extra_headers, source_site_instance, params.referrer, |
- params.disposition, params.should_replace_current_entry, |
- params.user_gesture); |
+ params.extra_headers, params.referrer, params.disposition, |
+ params.should_replace_current_entry, params.user_gesture); |
} |
void RenderFrameHostImpl::Stop() { |