| Index: content/browser/service_worker/service_worker_registration.cc
|
| diff --git a/content/browser/service_worker/service_worker_registration.cc b/content/browser/service_worker/service_worker_registration.cc
|
| index b389a153217a2cad783924fac04c0fb18915ac33..9e166b6f7b172fa7f9207ce46e17dbef1a8047eb 100644
|
| --- a/content/browser/service_worker/service_worker_registration.cc
|
| +++ b/content/browser/service_worker/service_worker_registration.cc
|
| @@ -38,22 +38,22 @@ ServiceWorkerRegistrationInfo ServiceWorkerRegistration::GetInfo() {
|
| pattern(),
|
| registration_id_,
|
| active_version_ ? active_version_->GetInfo() : ServiceWorkerVersionInfo(),
|
| - pending_version_ ? pending_version_->GetInfo()
|
| + waiting_version_ ? waiting_version_->GetInfo()
|
| : ServiceWorkerVersionInfo());
|
| }
|
|
|
| ServiceWorkerVersion* ServiceWorkerRegistration::GetNewestVersion() {
|
| if (active_version())
|
| return active_version();
|
| - return pending_version();
|
| + return waiting_version();
|
| }
|
|
|
| -void ServiceWorkerRegistration::ActivatePendingVersion() {
|
| +void ServiceWorkerRegistration::ActivateWaitingVersion() {
|
| active_version_->SetStatus(ServiceWorkerVersion::DEACTIVATED);
|
| - active_version_ = pending_version_;
|
| + active_version_ = waiting_version_;
|
| // TODO(kinuko): This should be set to ACTIVATING until activation finishes.
|
| active_version_->SetStatus(ServiceWorkerVersion::ACTIVE);
|
| - pending_version_ = NULL;
|
| + waiting_version_ = NULL;
|
| }
|
|
|
| } // namespace content
|
|
|