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_; |