Service Worker: Add ServiceWorkerContainer.getRegistrations() method.

content/browser/service_worker/service_worker_storage.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_STORAGE_H_
 #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_STORAGE_H_
 
 #include <deque>
 #include <map>
 #include <set>
@@ skipping 35 matching lines @@
 // This class provides an interface to store and retrieve ServiceWorker
 // registration data.
 class CONTENT_EXPORT ServiceWorkerStorage
     : NON_EXPORTED_BASE(public ServiceWorkerVersion::Listener) {
  public:
   typedef std::vector<ServiceWorkerDatabase::ResourceRecord> ResourceList;
   typedef base::Callback<void(ServiceWorkerStatusCode status)> StatusCallback;
   typedef base::Callback<void(ServiceWorkerStatusCode status,
                               const scoped_refptr<ServiceWorkerRegistration>&
                                   registration)> FindRegistrationCallback;
-  typedef base::Callback<
-      void(const std::vector<ServiceWorkerRegistrationInfo>& registrations)>
-          GetRegistrationsInfosCallback;
+  typedef base::Callback<void(const std::vector<ServiceWorkerRegistration*>&
+                                  registrations)> GetRegistrationsCallback;
+  typedef base::Callback<void(const std::vector<ServiceWorkerRegistrationInfo>&
+                                  registrations)> GetRegistrationsInfosCallback;
   typedef base::Callback<
       void(ServiceWorkerStatusCode status, bool are_equal)>
           CompareCallback;
   typedef base::Callback<
       void(const std::string& data, ServiceWorkerStatusCode status)>
           GetUserDataCallback;
   typedef base::Callback<void(
       const std::vector<std::pair<int64, std::string>>& user_data,
       ServiceWorkerStatusCode status)>
           GetUserDataForAllRegistrationsCallback;
@@ skipping 33 matching lines @@
   // Generally |FindRegistrationForId| should be used to look up a registration
   // by |registration_id| since it's more efficient. But if a |registration_id|
   // is all that is available this method can be used instead.
   // Like |FindRegistrationForId| this method may complete immediately (the
   // callback may be called prior to the method returning) or asynchronously.
   void FindRegistrationForIdOnly(int64 registration_id,
                                  const FindRegistrationCallback& callback);
 
   ServiceWorkerRegistration* GetUninstallingRegistration(const GURL& scope);
 
-  // Returns info about all stored and initially installing registrations for
-  // a given origin.
-  void GetRegistrationsForOrigin(
-      const GURL& origin, const GetRegistrationsInfosCallback& callback);
+  // Returns all stored registrations for a given origin.
+  void GetRegistrationsForOrigin(const GURL& origin,
+                                 const GetRegistrationsCallback& callback);
 
   // Returns info about all stored and initially installing registrations.
-  void GetAllRegistrations(const GetRegistrationsInfosCallback& callback);
+  void GetAllRegistrationsInfos(const GetRegistrationsInfosCallback& callback);
 
   // Commits |registration| with the installed but not activated |version|
   // to storage, overwritting any pre-existing registration data for the scope.
   // A pre-existing version's script resources remain available if that version
   // is live. PurgeResources should be called when it's OK to delete them.
   void StoreRegistration(ServiceWorkerRegistration* registration,
                          ServiceWorkerVersion* version,
                          const StatusCallback& callback);
 
   // Updates the state of the registration's stored version to active.
@@ skipping 117 matching lines @@
   struct DidDeleteRegistrationParams {
     int64 registration_id;
     GURL origin;
     StatusCallback callback;
 
     DidDeleteRegistrationParams();
     ~DidDeleteRegistrationParams();
   };
 
   typedef std::vector<ServiceWorkerDatabase::RegistrationData> RegistrationList;
+  typedef std::vector<ResourceList> ResourceListList;

[falken, 2015/06/05 02:58:22]

nit: It's subjective but feels nicer to me to just not typedef this.

[jungkees, 2015/06/05 06:58:07]

Removed the typedef. Seems ListList sounded odd and the original expression is
not that long, right?

[falken, 2015/06/08 04:59:09]

Yea ListList is weird and generally it's easier for me to understand
std::vector<XXX> than XXXList.

   typedef std::map<int64, scoped_refptr<ServiceWorkerRegistration> >
       RegistrationRefsById;
   typedef base::Callback<void(
       InitialData* data,
       ServiceWorkerDatabase::Status status)> InitializeCallback;
   typedef base::Callback<void(
       const GURL& origin,
       const ServiceWorkerDatabase::RegistrationData& deleted_version_data,
       const std::vector<int64>& newly_purgeable_resources,
       ServiceWorkerDatabase::Status status)> WriteRegistrationCallback;
@@ skipping 46 matching lines @@
       const GURL& scope,
       const FindRegistrationCallback& callback,
       const ServiceWorkerDatabase::RegistrationData& data,
       const ResourceList& resources,
       ServiceWorkerDatabase::Status status);
   void DidFindRegistrationForId(
       const FindRegistrationCallback& callback,
       const ServiceWorkerDatabase::RegistrationData& data,
       const ResourceList& resources,
       ServiceWorkerDatabase::Status status);
-  void DidGetRegistrations(
-      const GetRegistrationsInfosCallback& callback,
-      RegistrationList* registrations,
-      const GURL& origin_filter,
-      ServiceWorkerDatabase::Status status);
+  void DidGetRegistrations(const GetRegistrationsCallback& callback,
+                           RegistrationList* registrations,
+                           ResourceListList* resource_lists,
+                           const GURL& origin_filter,
+                           ServiceWorkerDatabase::Status status);
+  void DidGetRegistrationsInfos(const GetRegistrationsInfosCallback& callback,
+                                RegistrationList* registrations,
+                                const GURL& origin_filter,
+                                ServiceWorkerDatabase::Status status);
   void DidStoreRegistration(
       const StatusCallback& callback,
       const ServiceWorkerDatabase::RegistrationData& new_version,
       const GURL& origin,
       const ServiceWorkerDatabase::RegistrationData& deleted_version,
       const std::vector<int64>& newly_purgeable_resources,
       ServiceWorkerDatabase::Status status);
   void DidUpdateToActiveState(
       const StatusCallback& callback,
       ServiceWorkerDatabase::Status status);
@@ skipping 155 matching lines @@
   std::set<int64> pending_deletions_;
 
   base::WeakPtrFactory<ServiceWorkerStorage> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceWorkerStorage);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_STORAGE_H_