Chromium Code Reviews| 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 ef587ee2a6be68c21ca7abb745932d1110f73c72..61b45ab104172b3baf44d36879528c1aef0aa498 100644 |
| --- a/content/browser/service_worker/service_worker_registration.cc |
| +++ b/content/browser/service_worker/service_worker_registration.cc |
| @@ -78,18 +78,20 @@ void ServiceWorkerRegistration::RemoveListener(Listener* listener) { |
| } |
| void ServiceWorkerRegistration::NotifyRegistrationFailed() { |
| - FOR_EACH_OBSERVER(Listener, listeners_, OnRegistrationFailed(this)); |
| + for (auto& observer : listeners_) |
| + observer.OnRegistrationFailed(this); |
| NotifyRegistrationFinished(); |
| } |
| void ServiceWorkerRegistration::NotifyUpdateFound() { |
| - FOR_EACH_OBSERVER(Listener, listeners_, OnUpdateFound(this)); |
| + for (auto& observer : listeners_) |
| + observer.OnUpdateFound(this); |
| } |
| void ServiceWorkerRegistration::NotifyVersionAttributesChanged( |
| ChangedVersionAttributesMask mask) { |
| - FOR_EACH_OBSERVER(Listener, listeners_, |
| - OnVersionAttributesChanged(this, mask, GetInfo())); |
| + for (auto& observer : listeners_) |
| + observer.OnVersionAttributesChanged(this, mask, GetInfo()); |
| if (mask.active_changed() || mask.waiting_changed()) |
| NotifyRegistrationFinished(); |
| } |
| @@ -315,7 +317,8 @@ void ServiceWorkerRegistration::ActivateWaitingVersion(bool delay) { |
| activating_version->SetStatus(ServiceWorkerVersion::ACTIVATING); |
| // "9. Fire a simple event named controllerchange..." |
| if (activating_version->skip_waiting()) |
|
horo
2016/10/17 02:22:28
Nit: please add bracket.
if (activating_version
|
| - FOR_EACH_OBSERVER(Listener, listeners_, OnSkippedWaiting(this)); |
| + for (auto& observer : listeners_) |
| + observer.OnSkippedWaiting(this); |
| // "10. Queue a task to fire an event named activate..." |
| // The browser could be shutting down. To avoid spurious start worker |
| @@ -488,8 +491,8 @@ void ServiceWorkerRegistration::Clear() { |
| version->Doom(); |
| } |
| - FOR_EACH_OBSERVER( |
| - Listener, listeners_, OnRegistrationFinishedUninstalling(this)); |
| + for (auto& observer : listeners_) |
| + observer.OnRegistrationFinishedUninstalling(this); |
| } |
| void ServiceWorkerRegistration::OnRestoreFinished( |