| Index: ui/wm/core/default_activation_client.h
|
| diff --git a/ui/wm/core/default_activation_client.h b/ui/wm/core/default_activation_client.h
|
| index 726d88618f4f861b723dbcb298108a5e64ac7387..b5511457a9f89c8df07611204c0f379f032b4166 100644
|
| --- a/ui/wm/core/default_activation_client.h
|
| +++ b/ui/wm/core/default_activation_client.h
|
| @@ -60,7 +60,7 @@ class WM_EXPORT DefaultActivationClient : public aura::client::ActivationClient,
|
| // The window which was active before the currently active one.
|
| aura::Window* last_active_;
|
|
|
| - ObserverList<aura::client::ActivationChangeObserver> observers_;
|
| + base::ObserverList<aura::client::ActivationChangeObserver> observers_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(DefaultActivationClient);
|
| };
|
|
|