Shelf Cleanup AlternateShelfLayout P1 Attempt 3

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 a3179ebf7d2937ea579315a8a62c64dd3b564dd9..b55d8fe63dcf44a623503475b59c9a1c33b2acc6 100644
--- a/ash/system/tray/tray_constants.h
+++ b/ash/system/tray/tray_constants.h
@@ -17,10 +17,10 @@ extern const int kPaddingFromOuterEdgeOfLauncherVerticalAlignment;
 extern const int kPaddingFromInnerEdgeOfLauncherVerticalAlignment;
 extern const int kPaddingFromBottomOfScreenVerticalAlignment;
 
-extern const int kAlternateLayoutBubblePaddingHorizontalBottom;
-extern const int kAlternateLayoutBubblePaddingHorizontalSide;
-extern const int kAlternateLayoutBubblePaddingVerticalBottom;
-extern const int kAlternateLayoutBubblePaddingVerticalSide;
+extern const int kBubblePaddingHorizontalBottom;
+extern const int kBubblePaddingHorizontalSide;
+extern const int kBubblePaddingVerticalBottom;
+extern const int kBubblePaddingVerticalSide;
 
 extern const int kPaddingFromEdgeOfShelf;
 extern const int kTrayBubbleAnchorTopInsetBottomAnchor;
@@ -72,16 +72,12 @@ extern const int kNotificationIconWidth;
 extern const int kNotificationButtonWidth;
 extern const int kTrayNotificationContentsWidth;
 
+
 extern const int kTrayAvatarCornerRadius;
 extern const int kTrayAvatarSize;
 
-// 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();
+extern const int kTraySpacing;
+extern const int kShelfItemHeight;
 
 namespace test {
 const int kSettingsTrayItemViewId = 10000;