Shelf Cleanup AlternateShelfLayout P1 Attempt 3

ash/shelf/shelf_constants.h

Index: ash/shelf/shelf_constants.h
diff --git a/ash/shelf/shelf_constants.h b/ash/shelf/shelf_constants.h
index 9ae0b73e9b226ae7103eea839369913d9be3af83..67d8489f2bbd00d8cbb4f363acd052e582b1e83d 100644
--- a/ash/shelf/shelf_constants.h
+++ b/ash/shelf/shelf_constants.h
@@ -9,9 +9,6 @@
 
 namespace ash {
 
-// Height of the shelf. Hard coded to avoid resizing as items are added/removed.
-ASH_EXPORT extern const int kShelfPreferredSize;
-
 // Max alpha of the shelf background.
 ASH_EXPORT extern const int kShelfBackgroundAlpha;
 
@@ -20,6 +17,15 @@ extern const int kInvalidImageResourceID;
 
 extern const int kInvalidShelfID;
 
+// Size of the shelf when visible (height when the shelf is horizontal).
+ASH_EXPORT extern const int kShelfSize;
+
+// Size of the space between buttons on the shelf.
+ASH_EXPORT extern const int kShelfButtonSpacing;
+
+// Size allocated for each button on the shelf.
+ASH_EXPORT extern const int kShelfButtonSize;
+
 // Animation duration for switching black shelf and dock background on and off.
 ASH_EXPORT extern const int kTimeToSwitchBackgroundMs;