content/browser/frame_host/render_frame_host_impl.cc - Issue 1294243004: PlzNavigate: Make ServiceWorker work with PlzNavigate.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 1294243004: PlzNavigate: Make ServiceWorker work with PlzNavigate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Missed a spot. Created 5 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« content/browser/frame_host/navigator_delegate.h ('K') | « content/browser/frame_host/navigator_impl.cc ('k') | content/browser/loader/navigation_url_loader_impl.cc » ('j') | content/browser/service_worker/service_worker_context_core.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 488fad6ac2f16a5c604f863a188a6f637b7552a6..99a277dfbea4b35f993a1b261e6cbf667e1e2893 100644

--- a/content/browser/frame_host/render_frame_host_impl.cc

+++ b/content/browser/frame_host/render_frame_host_impl.cc

@@ -41,12 +41,14 @@

#include "content/browser/renderer_host/render_view_host_impl.h"

#include "content/browser/renderer_host/render_widget_host_impl.h"

#include "content/browser/renderer_host/render_widget_host_view_base.h"

+#include "content/browser/service_worker/service_worker_provider_host.h"

#include "content/common/accessibility_messages.h"

#include "content/common/frame_messages.h"

#include "content/common/input_messages.h"

#include "content/common/inter_process_time_ticks_converter.h"

#include "content/common/navigation_params.h"

#include "content/common/render_frame_setup.mojom.h"

+#include "content/common/service_worker/service_worker_types.h"

#include "content/common/site_isolation_policy.h"

#include "content/common/swapped_out_messages.h"

#include "content/public/browser/ax_event_notification_details.h"

@@ -911,7 +913,8 @@ void RenderFrameHostImpl::OnDidCommitProvisionalLoad(const IPC::Message& msg) {

if (!navigation_handle_) {

navigation_handle_ = NavigationHandleImpl::Create(

validated_params.url, frame_tree_node_->IsMainFrame(),

- frame_tree_node_->navigator()->GetDelegate());

+ frame_tree_node_->navigator()->GetDelegate(),

+ kInvalidServiceWorkerProviderId);

}

accessibility_reset_count_ = 0;