Revert of Shelf Cleanup (- binary files)

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 f7c3ed50bc1bb858214cda6148d5bbc565dbf87d..9ae0b73e9b226ae7103eea839369913d9be3af83 100644
--- a/ash/shelf/shelf_constants.h
+++ b/ash/shelf/shelf_constants.h
@@ -9,6 +9,9 @@
 
 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;
 
@@ -16,15 +19,6 @@
 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 between the buttons.
-ASH_EXPORT extern const int kShelfButtonSpacing;
-
-// Size allocated to for each button.
-ASH_EXPORT extern const int kShelfButtonSize;
 
 // Animation duration for switching black shelf and dock background on and off.
 ASH_EXPORT extern const int kTimeToSwitchBackgroundMs;