Revert of Ash:Shelf - Cleanup of Alternate Shelf (part 1)

ash/system/tray/tray_constants.cc

Index: ash/system/tray/tray_constants.cc
diff --git a/ash/system/tray/tray_constants.cc b/ash/system/tray/tray_constants.cc
index cdd56ffe046b0428d30feafe45ab0ab953e8d58c..db769ef6678e34614be1ce18e20b9a2339133bad 100644
--- a/ash/system/tray/tray_constants.cc
+++ b/ash/system/tray/tray_constants.cc
@@ -16,10 +16,10 @@
 const int kPaddingFromBottomOfScreenVerticalAlignment = 10;
 
 // Padding used to position the system menu relative to the status area.
-const int kBubblePaddingHorizontalBottom = 6;
-const int kBubblePaddingHorizontalSide = 10;
-const int kBubblePaddingVerticalBottom = 3;
-const int kBubblePaddingVerticalSide = 15;
+const int kAlternateLayoutBubblePaddingHorizontalBottom = 6;
+const int kAlternateLayoutBubblePaddingHorizontalSide = 10;
+const int kAlternateLayoutBubblePaddingVerticalBottom = 3;
+const int kAlternateLayoutBubblePaddingVerticalSide = 15;
 
 const int kPaddingFromEdgeOfShelf = 3;
 
@@ -73,15 +73,19 @@
 const int kTrayNotificationContentsWidth = kTrayPopupMinWidth -
     (kNotificationIconWidth + kNotificationButtonWidth +
      (kTrayPopupPaddingHorizontal / 2) * 3);
-const int kTraySpacing = 4;
-const int kShelfItemHeight = 38;
+const int kTraySpacing = 8;
+const int kAlternateTraySpacing = 4;
+const int kShelfItemHeight = 31;
+const int kAlternateShelfItemHeight = 38;
 
 int GetTraySpacing() {
-  return kTraySpacing;
+  return ash::switches::UseAlternateShelfLayout() ?
+      kAlternateTraySpacing : kTraySpacing;
 }
 
 int GetShelfItemHeight() {
-  return kShelfItemHeight;
+  return ash::switches::UseAlternateShelfLayout() ?
+      kAlternateShelfItemHeight : kShelfItemHeight;
 }
 
 }  // namespace ash