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

Unified Diff: content/browser/service_worker/service_worker_registration.cc

Issue 2418373002: Reduce FOR_EACH_OBSERVER usage in content/browser/service_worker (Closed)
Patch Set: add bracket Created 4 years, 2 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_registration.cc
diff --git a/content/browser/service_worker/service_worker_registration.cc b/content/browser/service_worker/service_worker_registration.cc
index ef587ee2a6be68c21ca7abb745932d1110f73c72..9efb7098bc6592fda893208fa8335a0dd7cabfa0 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();
}
@@ -314,8 +316,10 @@ void ServiceWorkerRegistration::ActivateWaitingVersion(bool delay) {
// "activating" as arguments."
activating_version->SetStatus(ServiceWorkerVersion::ACTIVATING);
// "9. Fire a simple event named controllerchange..."
- if (activating_version->skip_waiting())
- FOR_EACH_OBSERVER(Listener, listeners_, OnSkippedWaiting(this));
+ if (activating_version->skip_waiting()) {
+ 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 +492,8 @@ void ServiceWorkerRegistration::Clear() {
version->Doom();
}
- FOR_EACH_OBSERVER(
- Listener, listeners_, OnRegistrationFinishedUninstalling(this));
+ for (auto& observer : listeners_)
+ observer.OnRegistrationFinishedUninstalling(this);
}
void ServiceWorkerRegistration::OnRestoreFinished(
« no previous file with comments | « content/browser/service_worker/embedded_worker_instance.cc ('k') | content/browser/service_worker/service_worker_version.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698