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

Unified Diff: ui/wm/core/focus_controller.cc

Issue 2416963006: Remove usage of FOR_EACH_OBSERVER macro in ui/wm/. (Closed)
Patch Set: 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 | « ui/wm/core/default_activation_client.cc ('k') | ui/wm/core/transient_window_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/wm/core/focus_controller.cc
diff --git a/ui/wm/core/focus_controller.cc b/ui/wm/core/focus_controller.cc
index e1b644dccc75d72e6dd86b3849956e0d190dfdf5..594e66ee94db2655a9a8064e0c57e69141603ee3 100644
--- a/ui/wm/core/focus_controller.cc
+++ b/ui/wm/core/focus_controller.cc
@@ -244,11 +244,11 @@ void FocusController::SetFocusedWindow(aura::Window* window) {
if (focused_window_ && !observer_manager_.IsObserving(focused_window_))
observer_manager_.Add(focused_window_);
- FOR_EACH_OBSERVER(aura::client::FocusChangeObserver,
- focus_observers_,
- OnWindowFocused(focused_window_,
- window_tracker.Contains(lost_focus) ?
- lost_focus : NULL));
+ for (auto& observer : focus_observers_) {
+ observer.OnWindowFocused(
+ focused_window_,
+ window_tracker.Contains(lost_focus) ? lost_focus : NULL);
+ }
if (window_tracker.Contains(lost_focus)) {
aura::client::FocusChangeObserver* observer =
aura::client::GetFocusChangeObserver(lost_focus);
@@ -273,10 +273,8 @@ void FocusController::SetActiveWindow(
if (window == active_window_) {
if (requested_window) {
- FOR_EACH_OBSERVER(aura::client::ActivationChangeObserver,
- activation_observers_,
- OnAttemptToReactivateWindow(requested_window,
- active_window_));
+ for (auto& observer : activation_observers_)
+ observer.OnAttemptToReactivateWindow(requested_window, active_window_);
}
return;
}
@@ -314,11 +312,11 @@ void FocusController::SetActiveWindow(
reason, active_window_,
window_tracker.Contains(lost_activation) ? lost_activation : NULL);
}
- FOR_EACH_OBSERVER(
- aura::client::ActivationChangeObserver, activation_observers_,
- OnWindowActivated(
- reason, active_window_,
- window_tracker.Contains(lost_activation) ? lost_activation : NULL));
+ for (auto& observer : activation_observers_) {
+ observer.OnWindowActivated(
+ reason, active_window_,
+ window_tracker.Contains(lost_activation) ? lost_activation : NULL);
+ }
}
void FocusController::StackActiveWindow() {
« no previous file with comments | « ui/wm/core/default_activation_client.cc ('k') | ui/wm/core/transient_window_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698