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 db769ef6678e34614be1ce18e20b9a2339133bad..02ded699d4be00464624deec4f3732cae7d2e8ff 100644
--- a/ash/system/tray/tray_constants.cc
+++ b/ash/system/tray/tray_constants.cc
@@ -73,19 +73,15 @@ const int kNotificationButtonWidth = 32;
 const int kTrayNotificationContentsWidth = kTrayPopupMinWidth -
     (kNotificationIconWidth + kNotificationButtonWidth +
      (kTrayPopupPaddingHorizontal / 2) * 3);
-const int kTraySpacing = 8;
-const int kAlternateTraySpacing = 4;
-const int kShelfItemHeight = 31;
-const int kAlternateShelfItemHeight = 38;
+const int kTraySpacing = 4;
+const int kShelfItemHeight = 38;
 
 int GetTraySpacing() {
-  return ash::switches::UseAlternateShelfLayout() ?
-      kAlternateTraySpacing : kTraySpacing;
+  return kTraySpacing;
 }
 
 int GetShelfItemHeight() {
-  return ash::switches::UseAlternateShelfLayout() ?
-      kAlternateShelfItemHeight : kShelfItemHeight;
+  return kShelfItemHeight;
 }
 
 }  // namespace ash