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

Unified Diff: content/browser/service_worker/service_worker_provider_host.h

Issue 309453002: ServiceWorker: Rename 'pending version' to 'installing' or 'waiting' (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 6 years, 7 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_provider_host.h
diff --git a/content/browser/service_worker/service_worker_provider_host.h b/content/browser/service_worker/service_worker_provider_host.h
index 5aceebf47db37a8cfb03c595350509d55ac2a6ca..4e15254e1a1c4bf38d58ed2e21ae4768a4ca52d6 100644
--- a/content/browser/service_worker/service_worker_provider_host.h
+++ b/content/browser/service_worker/service_worker_provider_host.h
@@ -55,9 +55,9 @@ class CONTENT_EXPORT ServiceWorkerProviderHost
}
// The service worker version that corresponds with
- // navigate.serviceWorker.pending for our document.
- ServiceWorkerVersion* pending_version() const {
- return pending_version_.get();
+ // navigate.serviceWorker.waiting for our document.
+ ServiceWorkerVersion* waiting_version() const {
+ return waiting_version_.get();
}
// The running version, if any, that this provider is providing resource
@@ -69,11 +69,11 @@ class CONTENT_EXPORT ServiceWorkerProviderHost
void set_document_url(const GURL& url) { document_url_ = url; }
const GURL& document_url() const { return document_url_; }
- // Associate |version| to this provider as its '.active' or '.pending'
+ // Associate |version| to this provider as its '.active' or '.waiting'
// version.
// Giving NULL to this method will unset the corresponding field.
void SetActiveVersion(ServiceWorkerVersion* version);
- void SetPendingVersion(ServiceWorkerVersion* version);
+ void SetWaitingVersion(ServiceWorkerVersion* version);
// Returns false if the version is not in the expected STARTING in our
// our process state. That would be indicative of a bad IPC message.
@@ -93,7 +93,7 @@ class CONTENT_EXPORT ServiceWorkerProviderHost
const int provider_id_;
GURL document_url_;
scoped_refptr<ServiceWorkerVersion> active_version_;
- scoped_refptr<ServiceWorkerVersion> pending_version_;
+ scoped_refptr<ServiceWorkerVersion> waiting_version_;
scoped_refptr<ServiceWorkerVersion> running_hosted_version_;
base::WeakPtr<ServiceWorkerContextCore> context_;
ServiceWorkerDispatcherHost* dispatcher_host_;

Powered by Google App Engine
This is Rietveld 408576698