| Index: ash/mus/bridge/wm_window_mus.cc
|
| diff --git a/ash/mus/bridge/wm_window_mus.cc b/ash/mus/bridge/wm_window_mus.cc
|
| index d567d30ee82eddd08bcb6620fa90951f1d4e48ad..b35cad1fd4bd3de46a038bc37038175c43b06441 100644
|
| --- a/ash/mus/bridge/wm_window_mus.cc
|
| +++ b/ash/mus/bridge/wm_window_mus.cc
|
| @@ -882,10 +882,10 @@ void WmWindowMus::SetSnapsChildrenToPhysicalPixelBoundary() {
|
| return;
|
|
|
| snap_children_to_pixel_boundary_ = true;
|
| - FOR_EACH_OBSERVER(
|
| - WmWindowObserver, observers_,
|
| - OnWindowPropertyChanged(
|
| - this, WmWindowProperty::SNAP_CHILDREN_TO_PIXEL_BOUNDARY));
|
| + for (auto& observer : observers_) {
|
| + observer.OnWindowPropertyChanged(
|
| + this, WmWindowProperty::SNAP_CHILDREN_TO_PIXEL_BOUNDARY);
|
| + }
|
| }
|
|
|
| void WmWindowMus::SnapToPixelBoundaryIfNecessary() {
|
| @@ -942,8 +942,8 @@ void WmWindowMus::OnTreeChanging(const TreeChangeParams& params) {
|
| 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 WmWindowMus::OnTreeChanged(const TreeChangeParams& params) {
|
| @@ -951,15 +951,15 @@ void WmWindowMus::OnTreeChanged(const TreeChangeParams& params) {
|
| 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 WmWindowMus::OnWindowReordered(ui::Window* window,
|
| ui::Window* relative_window,
|
| ui::mojom::OrderDirection direction) {
|
| - FOR_EACH_OBSERVER(WmWindowObserver, observers_,
|
| - OnWindowStackingChanged(this));
|
| + for (auto& observer : observers_)
|
| + observer.OnWindowStackingChanged(this);
|
| }
|
|
|
| void WmWindowMus::OnWindowSharedPropertyChanged(
|
| @@ -972,15 +972,16 @@ void WmWindowMus::OnWindowSharedPropertyChanged(
|
| return;
|
| }
|
| if (name == ui::mojom::WindowManager::kWindowTitle_Property) {
|
| - FOR_EACH_OBSERVER(WmWindowObserver, observers_, OnWindowTitleChanged(this));
|
| + for (auto& observer : observers_)
|
| + observer.OnWindowTitleChanged(this);
|
| return;
|
| }
|
|
|
| // Notify WmWindowObserver of certain white-listed property changes.
|
| WmWindowProperty wm_property = WmWindowPropertyFromUI(name);
|
| if (wm_property != WmWindowProperty::INVALID_PROPERTY) {
|
| - FOR_EACH_OBSERVER(WmWindowObserver, observers_,
|
| - OnWindowPropertyChanged(this, wm_property));
|
| + for (auto& observer : observers_)
|
| + observer.OnWindowPropertyChanged(this, wm_property);
|
| return;
|
| }
|
|
|
| @@ -991,39 +992,41 @@ void WmWindowMus::OnWindowSharedPropertyChanged(
|
| void WmWindowMus::OnWindowBoundsChanged(ui::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 WmWindowMus::OnWindowDestroying(ui::Window* window) {
|
| - FOR_EACH_OBSERVER(WmWindowObserver, observers_, OnWindowDestroying(this));
|
| + for (auto& observer : observers_)
|
| + observer.OnWindowDestroying(this);
|
| }
|
|
|
| void WmWindowMus::OnWindowDestroyed(ui::Window* window) {
|
| - FOR_EACH_OBSERVER(WmWindowObserver, observers_, OnWindowDestroyed(this));
|
| + for (auto& observer : observers_)
|
| + observer.OnWindowDestroyed(this);
|
| }
|
|
|
| void WmWindowMus::OnWindowVisibilityChanging(ui::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 WmWindowMus::OnWindowVisibilityChanged(ui::Window* window, bool visible) {
|
| - FOR_EACH_OBSERVER(WmWindowObserver, observers_,
|
| - OnWindowVisibilityChanged(Get(window), visible));
|
| + for (auto& observer : observers_)
|
| + observer.OnWindowVisibilityChanged(Get(window), visible);
|
| }
|
|
|
| void WmWindowMus::OnTransientChildAdded(ui::Window* window,
|
| ui::Window* transient) {
|
| - FOR_EACH_OBSERVER(WmTransientWindowObserver, transient_observers_,
|
| - OnTransientChildAdded(this, Get(transient)));
|
| + for (auto& observer : transient_observers_)
|
| + observer.OnTransientChildAdded(this, Get(transient));
|
| }
|
|
|
| void WmWindowMus::OnTransientChildRemoved(ui::Window* window,
|
| ui::Window* transient) {
|
| - FOR_EACH_OBSERVER(WmTransientWindowObserver, transient_observers_,
|
| - OnTransientChildRemoved(this, Get(transient)));
|
| + for (auto& observer : transient_observers_)
|
| + observer.OnTransientChildRemoved(this, Get(transient));
|
| }
|
|
|
| } // namespace mus
|
|
|