| Index: ash/shelf/shelf_layout_manager.h
|
| diff --git a/ash/shelf/shelf_layout_manager.h b/ash/shelf/shelf_layout_manager.h
|
| index 96f405ecfac0ebee053f191c04e305bde3056da3..240e7658c292668344e01c4405ebd800b7888691 100644
|
| --- a/ash/shelf/shelf_layout_manager.h
|
| +++ b/ash/shelf/shelf_layout_manager.h
|
| @@ -376,7 +376,7 @@ class ASH_EXPORT ShelfLayoutManager
|
| // EventFilter used to detect when user issues a gesture on a bezel sensor.
|
| scoped_ptr<ShelfBezelEventFilter> bezel_event_filter_;
|
|
|
| - ObserverList<ShelfLayoutManagerObserver> observers_;
|
| + base::ObserverList<ShelfLayoutManagerObserver> observers_;
|
|
|
| // The shelf reacts to gesture-drags, and can be set to auto-hide for certain
|
| // gestures. Some shelf behaviour (e.g. visibility state, background color
|
|
|