content/browser/service_worker/service_worker_provider_host.cc - Issue 558873003: Better coordinate what's responsible for associating a registration to a document. During navigatio…

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/service_worker/service_worker_provider_host.cc

Issue 558873003: Better coordinate what's responsible for associating a registration to a document. During navigatio… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 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/service_worker/service_worker_controllee_request_handler.cc ('K') | « content/browser/service_worker/service_worker_provider_host.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/service_worker/service_worker_provider_host.cc

diff --git a/content/browser/service_worker/service_worker_provider_host.cc b/content/browser/service_worker/service_worker_provider_host.cc

index bd0c5ea3197e310de114dc2618f42abc0db0618d..fafe03a69a59d251b8bb502fa16addb947547092 100644

--- a/content/browser/service_worker/service_worker_provider_host.cc

+++ b/content/browser/service_worker/service_worker_provider_host.cc

@@ -28,7 +28,8 @@ ServiceWorkerProviderHost::ServiceWorkerProviderHost(

: process_id_(process_id),

provider_id_(provider_id),

context_(context),

- dispatcher_host_(dispatcher_host) {

+ dispatcher_host_(dispatcher_host),

+ allow_association_(true) {

}

ServiceWorkerProviderHost::~ServiceWorkerProviderHost() {

@@ -186,7 +187,7 @@ bool ServiceWorkerProviderHost::CanAssociateRegistration(

return false;

if (running_hosted_version_.get())

return false;

- if (!registration || associated_registration_.get())

+ if (!registration || associated_registration_.get() || !allow_association_)

return false;

return true;

}