Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1200)

Unified Diff: content/browser/service_worker/service_worker_context_core.cc

Issue 605163002: Service Worker: Remove legacy code for resolving register() to a version (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: only resolve on active_version 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
Index: content/browser/service_worker/service_worker_context_core.cc
diff --git a/content/browser/service_worker/service_worker_context_core.cc b/content/browser/service_worker/service_worker_context_core.cc
index 4615f8e56d07c67cf739a00e149e93c5c05497f0..a5abf968b70cd1ccec54445659d6c09802916e8c 100644
--- a/content/browser/service_worker/service_worker_context_core.cc
+++ b/content/browser/service_worker/service_worker_context_core.cc
@@ -180,8 +180,7 @@ void ServiceWorkerContextCore::RegisterServiceWorker(
DCHECK_CURRENTLY_ON(BrowserThread::IO);
if (storage()->IsDisabled()) {
callback.Run(SERVICE_WORKER_ERROR_ABORT,
- kInvalidServiceWorkerRegistrationId,
- kInvalidServiceWorkerVersionId);
+ kInvalidServiceWorkerRegistrationId);
return;
}
@@ -224,21 +223,15 @@ void ServiceWorkerContextCore::RegistrationComplete(
const GURL& pattern,
const ServiceWorkerContextCore::RegistrationCallback& callback,
ServiceWorkerStatusCode status,
- ServiceWorkerRegistration* registration,
- ServiceWorkerVersion* version) {
+ ServiceWorkerRegistration* registration) {
if (status != SERVICE_WORKER_OK) {
- DCHECK(!version);
- callback.Run(status,
- kInvalidServiceWorkerRegistrationId,
- kInvalidServiceWorkerVersionId);
+ DCHECK(!registration);
+ callback.Run(status, kInvalidServiceWorkerRegistrationId);
return;
}
- DCHECK(version);
- DCHECK_EQ(version->registration_id(), registration->id());
- callback.Run(status,
- registration->id(),
- version->version_id());
+ DCHECK(registration);
+ callback.Run(status, registration->id());
if (observer_list_.get()) {
observer_list_->Notify(&ServiceWorkerContextObserver::OnRegistrationStored,
pattern);

Powered by Google App Engine
This is Rietveld 408576698