| Index: ash/shelf/shelf_layout_manager.h
|
| diff --git a/ash/shelf/shelf_layout_manager.h b/ash/shelf/shelf_layout_manager.h
|
| index 8e1d30b34401e074455e91bc3097ef1cee289866..d1db4d97f7d10e6fa0c3892231cc5372e63e9943 100644
|
| --- a/ash/shelf/shelf_layout_manager.h
|
| +++ b/ash/shelf/shelf_layout_manager.h
|
| @@ -74,18 +74,10 @@ class ASH_EXPORT ShelfLayoutManager :
|
| // Size of the shelf when auto-hidden.
|
| static const int kAutoHideSize;
|
|
|
| - // The size of the shelf when shown (currently only used in alternate
|
| - // settings see ash::switches::UseAlternateShelfLayout).
|
| - static const int kShelfSize;
|
| -
|
| // Inset between the inner edge of the shelf (towards centre of screen), and
|
| // the shelf items, notifications, status area etc.
|
| static const int kShelfItemInset;
|
|
|
| - // Returns the preferred size for the shelf (either kShelfPreferredSize or
|
| - // kShelfSize).
|
| - static int GetPreferredShelfSize();
|
| -
|
| explicit ShelfLayoutManager(ShelfWidget* shelf);
|
| virtual ~ShelfLayoutManager();
|
|
|
|
|