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

Unified Diff: ash/aura/wm_window_aura.cc

Issue 2420863002: Remove usage of FOR_EACH_OBSERVER macro in ash/aura (Closed)
Patch Set: braces 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
« no previous file with comments | « ash/aura/wm_shell_aura.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/aura/wm_window_aura.cc
diff --git a/ash/aura/wm_window_aura.cc b/ash/aura/wm_window_aura.cc
index 0bff46ef796b6eaf2eaa81cd1e5c03b1ed5e02d3..4536719a982271cc1184f0e568ee7dfbb72c2743 100644
--- a/ash/aura/wm_window_aura.cc
+++ b/ash/aura/wm_window_aura.cc
@@ -810,8 +810,8 @@ void WmWindowAura::OnWindowHierarchyChanging(
wm_params.target = Get(params.target);
wm_params.new_parent = Get(params.new_parent);
wm_params.old_parent = Get(params.old_parent);
- FOR_EACH_OBSERVER(WmWindowObserver, observers_,
- OnWindowTreeChanging(this, wm_params));
+ for (auto& observer : observers_)
+ observer.OnWindowTreeChanging(this, wm_params);
}
void WmWindowAura::OnWindowHierarchyChanged(
@@ -820,13 +820,13 @@ void WmWindowAura::OnWindowHierarchyChanged(
wm_params.target = Get(params.target);
wm_params.new_parent = Get(params.new_parent);
wm_params.old_parent = Get(params.old_parent);
- FOR_EACH_OBSERVER(WmWindowObserver, observers_,
- OnWindowTreeChanged(this, wm_params));
+ for (auto& observer : observers_)
+ observer.OnWindowTreeChanged(this, wm_params);
}
void WmWindowAura::OnWindowStackingChanged(aura::Window* window) {
- FOR_EACH_OBSERVER(WmWindowObserver, observers_,
- OnWindowStackingChanged(this));
+ for (auto& observer : observers_)
+ observer.OnWindowStackingChanged(this);
}
void WmWindowAura::OnWindowPropertyChanged(aura::Window* window,
@@ -856,52 +856,55 @@ void WmWindowAura::OnWindowPropertyChanged(aura::Window* window,
} else {
return;
}
- FOR_EACH_OBSERVER(WmWindowObserver, observers_,
- OnWindowPropertyChanged(this, wm_property));
+ for (auto& observer : observers_)
+ observer.OnWindowPropertyChanged(this, wm_property);
}
void WmWindowAura::OnWindowBoundsChanged(aura::Window* window,
const gfx::Rect& old_bounds,
const gfx::Rect& new_bounds) {
- FOR_EACH_OBSERVER(WmWindowObserver, observers_,
- OnWindowBoundsChanged(this, old_bounds, new_bounds));
+ for (auto& observer : observers_)
+ observer.OnWindowBoundsChanged(this, old_bounds, new_bounds);
}
void WmWindowAura::OnWindowDestroying(aura::Window* window) {
- FOR_EACH_OBSERVER(WmWindowObserver, observers_, OnWindowDestroying(this));
+ for (auto& observer : observers_)
+ observer.OnWindowDestroying(this);
}
void WmWindowAura::OnWindowDestroyed(aura::Window* window) {
- FOR_EACH_OBSERVER(WmWindowObserver, observers_, OnWindowDestroyed(this));
+ for (auto& observer : observers_)
+ observer.OnWindowDestroyed(this);
}
void WmWindowAura::OnWindowVisibilityChanging(aura::Window* window,
bool visible) {
DCHECK_EQ(window, window_);
- FOR_EACH_OBSERVER(WmWindowObserver, observers_,
- OnWindowVisibilityChanging(this, visible));
+ for (auto& observer : observers_)
+ observer.OnWindowVisibilityChanging(this, visible);
}
void WmWindowAura::OnWindowVisibilityChanged(aura::Window* window,
bool visible) {
- FOR_EACH_OBSERVER(WmWindowObserver, observers_,
- OnWindowVisibilityChanged(Get(window), visible));
+ for (auto& observer : observers_)
+ observer.OnWindowVisibilityChanged(Get(window), visible);
}
void WmWindowAura::OnWindowTitleChanged(aura::Window* window) {
- FOR_EACH_OBSERVER(WmWindowObserver, observers_, OnWindowTitleChanged(this));
+ for (auto& observer : observers_)
+ observer.OnWindowTitleChanged(this);
}
void WmWindowAura::OnTransientChildAdded(aura::Window* window,
aura::Window* transient) {
- FOR_EACH_OBSERVER(WmTransientWindowObserver, transient_observers_,
- OnTransientChildAdded(this, Get(transient)));
+ for (auto& observer : transient_observers_)
+ observer.OnTransientChildAdded(this, Get(transient));
}
void WmWindowAura::OnTransientChildRemoved(aura::Window* window,
aura::Window* transient) {
- FOR_EACH_OBSERVER(WmTransientWindowObserver, transient_observers_,
- OnTransientChildRemoved(this, Get(transient)));
+ for (auto& observer : transient_observers_)
+ observer.OnTransientChildRemoved(this, Get(transient));
}
} // namespace ash
« no previous file with comments | « ash/aura/wm_shell_aura.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698