Index: content/browser/frame_host/navigator_impl.cc |
diff --git a/content/browser/frame_host/navigator_impl.cc b/content/browser/frame_host/navigator_impl.cc |
index 0759ebff60ab5bf16907ffd6e5d990c40db73241..05be4e90a85f22a94e05ea4d1da1841e3d4c5c2e 100644 |
--- a/content/browser/frame_host/navigator_impl.cc |
+++ b/content/browser/frame_host/navigator_impl.cc |
@@ -22,6 +22,7 @@ |
#include "content/browser/webui/web_ui_impl.h" |
#include "content/common/frame_messages.h" |
#include "content/common/navigation_params.h" |
+#include "content/common/service_worker/service_worker_types.h" |
#include "content/common/site_isolation_policy.h" |
#include "content/common/view_messages.h" |
#include "content/public/browser/browser_context.h" |
@@ -158,8 +159,8 @@ void NavigatorImpl::DidStartProvisionalLoad( |
render_frame_host->SetNavigationHandle(scoped_ptr<NavigationHandleImpl>()); |
} |
- render_frame_host->SetNavigationHandle( |
- NavigationHandleImpl::Create(validated_url, is_main_frame, delegate_)); |
+ render_frame_host->SetNavigationHandle(NavigationHandleImpl::Create( |
+ validated_url, is_main_frame, render_frame_host->frame_tree_node())); |
} |
void NavigatorImpl::DidFailProvisionalLoadWithError( |
@@ -686,7 +687,7 @@ void NavigatorImpl::OnBeginNavigation( |
controller_->GetLastCommittedEntryIndex(), |
controller_->GetEntryCount())); |
NavigationRequest* navigation_request = frame_tree_node->navigation_request(); |
- navigation_request->CreateNavigationHandle(delegate_); |
+ navigation_request->CreateNavigationHandle(); |
if (frame_tree_node->IsMainFrame()) { |
// Renderer-initiated main-frame navigations that need to swap processes |
@@ -750,7 +751,6 @@ void NavigatorImpl::CommitNavigation(FrameTreeNode* frame_tree_node, |
render_frame_host->CommitNavigation(response, body.Pass(), |
navigation_request->common_params(), |
navigation_request->request_params()); |
- |
} |
// PlzNavigate |
@@ -855,7 +855,7 @@ void NavigatorImpl::RequestNavigation( |
navigation_type, is_same_document_history_load, navigation_start, |
controller_)); |
NavigationRequest* navigation_request = frame_tree_node->navigation_request(); |
- navigation_request->CreateNavigationHandle(delegate_); |
+ navigation_request->CreateNavigationHandle(); |
// Have the current renderer execute its beforeunload event if needed. If it |
// is not needed (when beforeunload dispatch is not needed or this navigation |