| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 #ifndef CONTENT_COMMON_SERVICE_WORKER_SERVICE_WORKER_TYPES_H_ | 5 #ifndef CONTENT_COMMON_SERVICE_WORKER_SERVICE_WORKER_TYPES_H_ |
| 6 #define CONTENT_COMMON_SERVICE_WORKER_SERVICE_WORKER_TYPES_H_ | 6 #define CONTENT_COMMON_SERVICE_WORKER_SERVICE_WORKER_TYPES_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 149 int handle_id; | 149 int handle_id; |
| 150 GURL scope; | 150 GURL scope; |
| 151 GURL url; | 151 GURL url; |
| 152 blink::WebServiceWorkerState state; | 152 blink::WebServiceWorkerState state; |
| 153 }; | 153 }; |
| 154 | 154 |
| 155 struct ServiceWorkerRegistrationObjectInfo { | 155 struct ServiceWorkerRegistrationObjectInfo { |
| 156 ServiceWorkerRegistrationObjectInfo(); | 156 ServiceWorkerRegistrationObjectInfo(); |
| 157 int handle_id; | 157 int handle_id; |
| 158 GURL scope; | 158 GURL scope; |
| 159 int64 registration_id; |
| 159 }; | 160 }; |
| 160 | 161 |
| 161 struct ServiceWorkerVersionAttributes { | 162 struct ServiceWorkerVersionAttributes { |
| 162 ServiceWorkerObjectInfo installing; | 163 ServiceWorkerObjectInfo installing; |
| 163 ServiceWorkerObjectInfo waiting; | 164 ServiceWorkerObjectInfo waiting; |
| 164 ServiceWorkerObjectInfo active; | 165 ServiceWorkerObjectInfo active; |
| 165 }; | 166 }; |
| 166 | 167 |
| 167 class ChangedVersionAttributesMask { | 168 class ChangedVersionAttributesMask { |
| 168 public: | 169 public: |
| (...skipping 15 matching lines...) Expand all Loading... |
| 184 bool active_changed() const { return !!(changed_ & ACTIVE_VERSION); } | 185 bool active_changed() const { return !!(changed_ & ACTIVE_VERSION); } |
| 185 bool controller_changed() const { return !!(changed_ & CONTROLLING_VERSION); } | 186 bool controller_changed() const { return !!(changed_ & CONTROLLING_VERSION); } |
| 186 | 187 |
| 187 private: | 188 private: |
| 188 int changed_; | 189 int changed_; |
| 189 }; | 190 }; |
| 190 | 191 |
| 191 } // namespace content | 192 } // namespace content |
| 192 | 193 |
| 193 #endif // CONTENT_COMMON_SERVICE_WORKER_SERVICE_WORKER_TYPES_H_ | 194 #endif // CONTENT_COMMON_SERVICE_WORKER_SERVICE_WORKER_TYPES_H_ |
| OLD | NEW |