Chromium Code Reviews| Index: content/browser/service_worker/service_worker_register_job.h |
| diff --git a/content/browser/service_worker/service_worker_register_job.h b/content/browser/service_worker/service_worker_register_job.h |
| index 0a0c198fcb1313626af87c491909f76e875f65c5..a1faa2acef6663e0bc6e94ccf1278f9108e9f252 100644 |
| --- a/content/browser/service_worker/service_worker_register_job.h |
| +++ b/content/browser/service_worker/service_worker_register_job.h |
| @@ -58,7 +58,7 @@ class ServiceWorkerRegisterJob : public ServiceWorkerRegisterJobBase { |
| private: |
| FRIEND_TEST_ALL_PREFIXES(ServiceWorkerRegisterJobAndProviderHostTest, |
| - AssociatePendingVersionToDocuments); |
| + AssociateWaitingVersionToDocuments); |
| enum Phase { |
| INITIAL, |
| @@ -77,13 +77,13 @@ class ServiceWorkerRegisterJob : public ServiceWorkerRegisterJobBase { |
| Internal(); |
| ~Internal(); |
| scoped_refptr<ServiceWorkerRegistration> registration; |
| - scoped_refptr<ServiceWorkerVersion> pending_version; |
| + scoped_refptr<ServiceWorkerVersion> waiting_version; |
|
falken
2014/05/29 07:23:34
pending_version here doesn't necessarily correspon
michaeln1
2014/05/29 21:16:52
+1 keeping this as "pending" (or something else th
nhiroki
2014/05/30 00:38:20
Reverted this to 'pending' and added comment.
|
| }; |
| void set_registration(ServiceWorkerRegistration* registration); |
| ServiceWorkerRegistration* registration(); |
| - void set_pending_version(ServiceWorkerVersion* version); |
| - ServiceWorkerVersion* pending_version(); |
| + void set_waiting_version(ServiceWorkerVersion* version); |
| + ServiceWorkerVersion* waiting_version(); |
| void SetPhase(Phase phase); |
| @@ -104,7 +104,7 @@ class ServiceWorkerRegisterJob : public ServiceWorkerRegisterJobBase { |
| ServiceWorkerRegistration* registration, |
| ServiceWorkerVersion* version); |
| - CONTENT_EXPORT void AssociatePendingVersionToDocuments( |
| + CONTENT_EXPORT void AssociateWaitingVersionToDocuments( |
| ServiceWorkerVersion* version); |
| // The ServiceWorkerContextCore object should always outlive this. |