OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/browser/service_worker/service_worker_storage.h" | 5 #include "content/browser/service_worker/service_worker_storage.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/bind_helpers.h" | 9 #include "base/bind_helpers.h" |
10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
(...skipping 520 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
531 DCHECK(pushed_registrations.insert(it->registration_id).second); | 531 DCHECK(pushed_registrations.insert(it->registration_id).second); |
532 ServiceWorkerRegistration* registration = | 532 ServiceWorkerRegistration* registration = |
533 context_->GetLiveRegistration(it->registration_id); | 533 context_->GetLiveRegistration(it->registration_id); |
534 if (registration) { | 534 if (registration) { |
535 infos.push_back(registration->GetInfo()); | 535 infos.push_back(registration->GetInfo()); |
536 continue; | 536 continue; |
537 } | 537 } |
538 ServiceWorkerRegistrationInfo info; | 538 ServiceWorkerRegistrationInfo info; |
539 info.pattern = it->scope; | 539 info.pattern = it->scope; |
540 info.script_url = it->script; | 540 info.script_url = it->script; |
| 541 info.registration_id = it->registration_id; |
541 info.active_version.is_null = false; | 542 info.active_version.is_null = false; |
542 if (it->is_active) | 543 if (it->is_active) |
543 info.active_version.status = ServiceWorkerVersion::ACTIVE; | 544 info.active_version.status = ServiceWorkerVersion::ACTIVE; |
544 else | 545 else |
545 info.active_version.status = ServiceWorkerVersion::INSTALLED; | 546 info.active_version.status = ServiceWorkerVersion::INSTALLED; |
546 info.active_version.version_id = it->version_id; | 547 info.active_version.version_id = it->version_id; |
547 infos.push_back(info); | 548 infos.push_back(info); |
548 } | 549 } |
549 | 550 |
550 // Add unstored registrations that are being installed. | 551 // Add unstored registrations that are being installed. |
(...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
901 const FindInDBCallback& callback) { | 902 const FindInDBCallback& callback) { |
902 ServiceWorkerDatabase::RegistrationData data; | 903 ServiceWorkerDatabase::RegistrationData data; |
903 ResourceList resources; | 904 ResourceList resources; |
904 ServiceWorkerDatabase::Status status = | 905 ServiceWorkerDatabase::Status status = |
905 database->ReadRegistration(registration_id, origin, &data, &resources); | 906 database->ReadRegistration(registration_id, origin, &data, &resources); |
906 original_task_runner->PostTask( | 907 original_task_runner->PostTask( |
907 FROM_HERE, base::Bind(callback, data, resources, status)); | 908 FROM_HERE, base::Bind(callback, data, resources, status)); |
908 } | 909 } |
909 | 910 |
910 } // namespace content | 911 } // namespace content |
OLD | NEW |