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

ash/system/tray/tray_constants.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/system/tray/tray_constants.h"
 
 #include "ash/ash_switches.h"
 #include "third_party/skia/include/core/SkColor.h"
 
 namespace ash {
 
 const int kPaddingFromRightEdgeOfScreenBottomAlignment = 7;
 const int kPaddingFromBottomOfScreenBottomAlignment = 7;
 const int kPaddingFromOuterEdgeOfLauncherVerticalAlignment = 8;
 const int kPaddingFromInnerEdgeOfLauncherVerticalAlignment = 9;
 const int kPaddingFromBottomOfScreenVerticalAlignment = 10;
 
 // Padding used to position the system menu relative to the status area.
-const int kAlternateLayoutBubblePaddingHorizontalBottom = 6;
-const int kAlternateLayoutBubblePaddingHorizontalSide = 10;
-const int kAlternateLayoutBubblePaddingVerticalBottom = 3;
-const int kAlternateLayoutBubblePaddingVerticalSide = 15;
+const int kBubblePaddingHorizontalBottom = 6;
+const int kBubblePaddingHorizontalSide = 10;
+const int kBubblePaddingVerticalBottom = 3;
+const int kBubblePaddingVerticalSide = 15;
 
 const int kPaddingFromEdgeOfShelf = 3;
 
 // Top inset of system tray bubble for bottom anchor alignment.
 const int kTrayBubbleAnchorTopInsetBottomAnchor = 3;
 
 const int kTrayImageItemHorizontalPaddingBottomAlignment = 1;
 const int kTrayImageItemHorizontalPaddingVerticalAlignment = 1;
 const int kTrayImageItemVerticalPaddingVerticalAlignment = 1;
 
@@ skipping 33 matching lines @@
 const SkColor kHeaderTextColorNormal = SkColorSetARGB(0x7f, 0, 0, 0);
 const SkColor kHeaderTextColorHover = SkColorSetARGB(0xd3, 0, 0, 0);
 
 const int kTrayPopupMinWidth = 300;
 const int kTrayPopupMaxWidth = 500;
 const int kNotificationIconWidth = 40;
 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() {

[James Cook, 2014/01/23 18:02:35]

Maybe not for this CL, but references to this function could be replaced with
just using the constant.

[Harry McCleave, 2014/01/24 22:48:47]

ShelfItemHeight as well, will do in part 2.

-  return ash::switches::UseAlternateShelfLayout() ?
-      kAlternateTraySpacing : kTraySpacing;
+  return kTraySpacing;
 }
 
 int GetShelfItemHeight() {
-  return ash::switches::UseAlternateShelfLayout() ?
-      kAlternateShelfItemHeight : kShelfItemHeight;
+  return kShelfItemHeight;
 }
 
 }  // namespace ash