Revert of Shelf Cleanup (- binary files)

ash/system/tray/tray_constants.h

Index: ash/system/tray/tray_constants.h
diff --git a/ash/system/tray/tray_constants.h b/ash/system/tray/tray_constants.h
index 0171f3c6b05691c8d61df4a4178a3c13686fe29f..d5187f38fa53fd139d898820c8b2eacdc36a60a6 100644
--- a/ash/system/tray/tray_constants.h
+++ b/ash/system/tray/tray_constants.h
@@ -15,10 +15,10 @@
 extern const int kPaddingFromInnerEdgeOfLauncherVerticalAlignment;
 extern const int kPaddingFromBottomOfScreenVerticalAlignment;
 
-extern const int kBubblePaddingHorizontalBottom;
-extern const int kBubblePaddingHorizontalSide;
-extern const int kBubblePaddingVerticalBottom;
-extern const int kBubblePaddingVerticalSide;
+extern const int kAlternateLayoutBubblePaddingHorizontalBottom;
+extern const int kAlternateLayoutBubblePaddingHorizontalSide;
+extern const int kAlternateLayoutBubblePaddingVerticalBottom;
+extern const int kAlternateLayoutBubblePaddingVerticalSide;
 
 extern const int kPaddingFromEdgeOfShelf;
 extern const int kTrayBubbleAnchorTopInsetBottomAnchor;
@@ -67,8 +67,13 @@
 extern const int kNotificationButtonWidth;
 extern const int kTrayNotificationContentsWidth;
 
-extern const int kTraySpacing;
-extern const int kShelfItemHeight;
+// Returns kTraySpacing or kAlternateTraySpacing as applicable
+// (Determined by ash::switches::UseAlternateShelfLayout).
+int GetTraySpacing();
+
+// Returns kShelfItemHeight or kAlternateShelfItemHeight as applicable
+// (Determined by ash::switches::UseAlternateShelfLayout).
+int GetShelfItemHeight();
 
 }  // namespace ash