content/browser/service_worker/service_worker_controllee_request_handler.cc - Issue 871853002: ServiceWorker: add ServiceWorkerClients.claim() support (2/3).

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_controllee_request_handler.cc

Issue 871853002: ServiceWorker: add ServiceWorkerClients.claim() support (2/3). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: remove should_notify_controllerchange flag Created 5 years, 11 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

« no previous file with comments | « no previous file | content/browser/service_worker/service_worker_provider_host.h » ('j') | content/browser/service_worker/service_worker_provider_host.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/service_worker/service_worker_controllee_request_handler.cc

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

index db83628fc795b49cf76c36dbfc0669cacb5a4ca3..5721f38c546b7740e96e07bc27a36aa0b7b2894a 100644

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

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

@@ -240,7 +240,7 @@ ServiceWorkerControlleeRequestHandler::DidLookupRegistrationForMainResource(

ServiceWorkerMetrics::CountControlledPageLoad();

- provider_host_->AssociateRegistration(registration.get());

+ provider_host_->UseRegistration(registration.get());

michaeln 2015/01/28 21:11:14 please stick with the verb associate, we have othe

job_->ForwardToServiceWorker();

TRACE_EVENT_ASYNC_END2(

"ServiceWorker",

@@ -265,7 +265,7 @@ void ServiceWorkerControlleeRequestHandler::OnVersionStatusChanged(

ServiceWorkerMetrics::CountControlledPageLoad();

- provider_host_->AssociateRegistration(registration);

+ provider_host_->UseRegistration(registration);

job_->ForwardToServiceWorker();

}