| Index: ash/wm/window_state.h
|
| diff --git a/ash/wm/window_state.h b/ash/wm/window_state.h
|
| index cc4627377688ca92ec0d33fd2cbdc3ab6011d533..f74d9befe174cfa141ee8460404baf11be172424 100644
|
| --- a/ash/wm/window_state.h
|
| +++ b/ash/wm/window_state.h
|
| @@ -370,7 +370,7 @@ class ASH_EXPORT WindowState : public aura::WindowObserver {
|
| // restored when only this one window gets shown.
|
| scoped_ptr<gfx::Rect> pre_auto_manage_window_bounds_;
|
|
|
| - ObserverList<WindowStateObserver> observer_list_;
|
| + base::ObserverList<WindowStateObserver> observer_list_;
|
|
|
| // True to ignore a property change event to avoid reentrance in
|
| // UpdateWindowStateType()
|
|
|