| Index: ash/shelf/shelf_layout_manager.h
|
| diff --git a/ash/shelf/shelf_layout_manager.h b/ash/shelf/shelf_layout_manager.h
|
| index 40e1355e5662a4aa1d860649d12bd3a97cc2676f..80b06e124123c1c1fccaf181b1b6c6b28858ae7c 100644
|
| --- a/ash/shelf/shelf_layout_manager.h
|
| +++ b/ash/shelf/shelf_layout_manager.h
|
| @@ -365,7 +365,7 @@ class ASH_EXPORT ShelfLayoutManager
|
| // Do any windows overlap the shelf? This is maintained by WorkspaceManager.
|
| bool window_overlaps_shelf_;
|
|
|
| - base::OneShotTimer<ShelfLayoutManager> auto_hide_timer_;
|
| + base::OneShotTimer auto_hide_timer_;
|
|
|
| // Whether the mouse was over the shelf when the auto hide timer started.
|
| // False when neither the auto hide timer nor the timer task are running.
|
|
|