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

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

Issue 1162943002: Replace more ObserverList with base::ObserverList. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@observer
Patch Set: Created 5 years, 7 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.h ('k') | ui/wm/core/transient_window_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/wm/core/focus_controller.h
diff --git a/ui/wm/core/focus_controller.h b/ui/wm/core/focus_controller.h
index 43d3c608b2138493f070bce4150b24a073edca58..be04b49fe00725c7c81a0a02919ef9268061d198 100644
--- a/ui/wm/core/focus_controller.h
+++ b/ui/wm/core/focus_controller.h
@@ -107,8 +107,9 @@ class WM_EXPORT FocusController : public aura::client::ActivationClient,
scoped_ptr<FocusRules> rules_;
- ObserverList<aura::client::ActivationChangeObserver> activation_observers_;
- ObserverList<aura::client::FocusChangeObserver> focus_observers_;
+ base::ObserverList<aura::client::ActivationChangeObserver>
+ activation_observers_;
+ base::ObserverList<aura::client::FocusChangeObserver> focus_observers_;
ScopedObserver<aura::Window, aura::WindowObserver> observer_manager_;
« no previous file with comments | « ui/wm/core/default_activation_client.h ('k') | ui/wm/core/transient_window_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698