content/browser/service_worker/service_worker_context_wrapper.cc - Issue 1146913004: Service Worker: Add ServiceWorkerContainer.getRegistrations() method.

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

Issue 1146913004: Service Worker: Add ServiceWorkerContainer.getRegistrations() method. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Make GetRegistrationsForOrigin() handle nullptr for resource param. Created 5 years, 6 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 | « content/browser/service_worker/service_worker_context_core.cc ('k') | content/browser/service_worker/service_worker_database.h » ('j') | content/browser/service_worker/service_worker_database.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/service_worker/service_worker_context_wrapper.cc

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

index 8df6f4297a8cf06b966b6ef26caca543ecf9b0a0..64232dbc1442a243a0ab59e714eb19e6f83446cd 100644

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

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

@@ -336,10 +336,9 @@ void ServiceWorkerContextWrapper::GetAllOriginsInfo(

base::Bind(callback, std::vector<ServiceWorkerUsageInfo>()));

return;

}

- context()->storage()->GetAllRegistrations(base::Bind(

+ context()->storage()->GetAllRegistrationsInfos(base::Bind(

&ServiceWorkerContextWrapper::DidGetAllRegistrationsForGetAllOrigins,

- this,

- callback));

+ this, callback));

}

void ServiceWorkerContextWrapper::DidGetAllRegistrationsForGetAllOrigins(

@@ -522,7 +521,7 @@ void ServiceWorkerContextWrapper::GetAllRegistrations(

RunSoon(base::Bind(callback, std::vector<ServiceWorkerRegistrationInfo>()));

return;

}

- context_core_->storage()->GetAllRegistrations(callback);

+ context_core_->storage()->GetAllRegistrationsInfos(callback);

}

void ServiceWorkerContextWrapper::GetRegistrationUserData(