| Index: ash/shelf/shelf_layout_manager.cc
|
| diff --git a/ash/shelf/shelf_layout_manager.cc b/ash/shelf/shelf_layout_manager.cc
|
| index b0dab2fa6b0c742c1b128eb0afef4c4c3df73f07..21e46d8ae4a45cdc2de59c08f1b3ea9989475eea 100644
|
| --- a/ash/shelf/shelf_layout_manager.cc
|
| +++ b/ash/shelf/shelf_layout_manager.cc
|
| @@ -70,11 +70,6 @@ bool IsDraggingTrayEnabled() {
|
| return dragging_tray_allowed;
|
| }
|
|
|
| -int GetPreferredShelfSize() {
|
| - return ash::switches::UseAlternateShelfLayout() ?
|
| - ShelfLayoutManager::kShelfSize : kLauncherPreferredSize;
|
| -}
|
| -
|
| } // namespace
|
|
|
| // static
|
| @@ -89,6 +84,11 @@ const int ShelfLayoutManager::kAutoHideSize = 3;
|
| // static
|
| const int ShelfLayoutManager::kShelfSize = 47;
|
|
|
| +int ShelfLayoutManager::GetPreferredShelfSize() {
|
| + return ash::switches::UseAlternateShelfLayout() ?
|
| + ShelfLayoutManager::kShelfSize : kLauncherPreferredSize;
|
| +}
|
| +
|
| // ShelfLayoutManager::AutoHideEventFilter -------------------------------------
|
|
|
| // Notifies ShelfLayoutManager any time the mouse moves.
|
|
|