| 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 e71c219091b1ee53ef930b4c34033ecd2f4ba380..d58dd9f1dc19250d432033c287a271699a5b2391 100644
|
| --- a/content/browser/frame_host/render_frame_host_impl.cc
|
| +++ b/content/browser/frame_host/render_frame_host_impl.cc
|
| @@ -586,16 +586,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(
|
| @@ -1301,8 +1293,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::OpenURL", "url",
|
| + 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() {
|
|
|