Remove unused variables in tray_constants.

Bug: 982950
Change-Id: I8e5a45f88daf23b7b64216e461454f97f99d3cd9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1704678
Commit-Queue: Min Chen <minch@chromium.org>
Reviewed-by: Ahmed Fakhry <afakhry@chromium.org>
Cr-Commit-Position: refs/heads/master@{#678520}

ash/shelf/shelf_tooltip_bubble.cc

@@ -11,25 +11,29 @@
 #include "ui/views/layout/fill_layout.h"
 
 namespace ash {
-
-// Tooltip layout constants.
+namespace {
 
 // Shelf item tooltip height.
-const int kTooltipHeight = 24;
+constexpr int kTooltipHeight = 24;
 
 // The maximum width of the tooltip bubble.  Borrowed the value from
 // ash/tooltip/tooltip_controller.cc
-const int kTooltipMaxWidth = 250;
+constexpr int kTooltipMaxWidth = 250;
 
 // Shelf item tooltip internal text margins.
-const int kTooltipTopBottomMargin = 4;
-const int kTooltipLeftRightMargin = 8;
+constexpr int kTooltipTopBottomMargin = 4;
+constexpr int kTooltipLeftRightMargin = 8;
 
 // The offset for the tooltip bubble - making sure that the bubble is spaced
 // with a fixed gap. The gap is accounted for by the transparent arrow in the
 // bubble and an additional 1px padding for the shelf item views.
-const int kArrowTopBottomOffset = 1;
-const int kArrowLeftRightOffset = 1;
+constexpr int kArrowTopBottomOffset = 1;
+constexpr int kArrowLeftRightOffset = 1;
+
+// Padding used to position the tooltip relative to the shelf.
+constexpr int kTooltipPaddingHorizontalBottom = 6;
+
+}  // namespace
 
 ShelfTooltipBubble::ShelfTooltipBubble(views::View* anchor,
                                        ShelfAlignment alignment,
@@ -57,7 +61,7 @@ ShelfTooltipBubble::ShelfTooltipBubble(views::View* anchor,
   // Adjust the anchor location for asymmetrical borders of shelf item.
   if (anchor->border())
     insets += anchor->border()->GetInsets();
-  insets += gfx::Insets(-kBubblePaddingHorizontalBottom);
+  insets += gfx::Insets(-kTooltipPaddingHorizontalBottom);
   set_anchor_view_insets(insets);
 
   CreateBubble();

ash/system/tray/tray_constants.cc

@@ -10,19 +10,11 @@
 
 namespace ash {
 
-// Padding used to position the system menu relative to the status area.
-const int kBubblePaddingHorizontalBottom = 6;
-
 const int kTrayTextFontSizeIncrease = 2;
 
 // Size of tray items on the primary axis.
 const int kTrayItemSize = 32;
 
-const int kTrayLabelItemHorizontalPaddingBottomAlignment = 7;
-
-// Vertical padding between status tray items when the shelf is vertical.
-const int kTrayLabelItemVerticalPaddingVerticalAlignment = 4;
-
 const int kTrayMenuWidth = 360;
 
 const int kTrayPopupAutoCloseDelayInSeconds = 2;
@@ -35,19 +27,12 @@ const int kTrayPopupItemMinStartWidth = 48;
 const int kTrayPopupItemMinEndWidth =
     kMenuIconSize + 2 * kTrayPopupButtonEndMargin;
 
-const int kTrayDetailedViewTransitionDelayMs = 100;
-
 const int kTrayPopupLabelRightPadding = 8;
 
 const int kTrayRoundedBorderRadius = 2;
 
 const int kTrayToggleButtonWidth = 68;
 
-const SkColor kPublicAccountUserCardTextColor = SkColorSetRGB(0x66, 0x66, 0x66);
-const SkColor kPublicAccountUserCardNameColor = SK_ColorBLACK;
-
-const SkColor kHeaderBackgroundColor = SkColorSetRGB(0xf5, 0xf5, 0xf5);
-
 const SkColor kMobileNotConnectedXIconColor = SkColorSetRGB(0xb2, 0xb2, 0xb2);
 
 const SkColor kTrayIconColor = gfx::kGoogleGrey200;
@@ -76,8 +61,6 @@ const float kTrayPopupInkDropHighlightOpacity = 0.08f;
 const int kTrayPopupInkDropInset = 4;
 const int kTrayPopupInkDropCornerRadius = 2;
 
-const int kTrayPopupSystemInfoRowHeight = 40;
-
 static_assert(kTrayMenuWidth == kUnifiedFeaturePodHorizontalSidePadding * 2 +
                                     kUnifiedFeaturePodHorizontalMiddlePadding *
                                         (kUnifiedFeaturePodItemsInRow - 1) +

ash/system/tray/tray_constants.h

@@ -15,8 +15,6 @@
 
 namespace ash {
 
-extern const int kBubblePaddingHorizontalBottom;
-
 // The size delta between the default font and the font size found in tray
 // items like labels and buttons.
 extern const int kTrayTextFontSizeIncrease;
@@ -26,9 +24,6 @@ ASH_EXPORT extern const int kTrayItemSize;
 // Extra padding used beside a single icon in the tray area of the shelf.
 constexpr int kTrayImageItemPadding = 3;
 
-extern const int kTrayLabelItemHorizontalPaddingBottomAlignment;
-extern const int kTrayLabelItemVerticalPaddingVerticalAlignment;
-
 // The width of the tray menu.
 extern const int kTrayMenuWidth;
 
@@ -53,10 +48,6 @@ extern const int kTrayPopupItemMinStartWidth;
 // The width used for the end region of the row (usually a more arrow).
 extern const int kTrayPopupItemMinEndWidth;
 
-// When transitioning between a detailed and a default view, this delay is used
-// before the transition starts.
-ASH_EXPORT extern const int kTrayDetailedViewTransitionDelayMs;
-
 // Padding used on right side of labels to keep minimum distance to the next
 // item. This applies to all labels in the system menu.
 extern const int kTrayPopupLabelRightPadding;
@@ -66,17 +57,8 @@ extern const int kTrayRoundedBorderRadius;
 // The width of ToggleButton views including any border padding.
 extern const int kTrayToggleButtonWidth;
 
-extern const SkColor kPublicAccountUserCardTextColor;
-extern const SkColor kPublicAccountUserCardNameColor;
-
-extern const SkColor kHeaderBackgroundColor;
-
 // Constants for the title row.
-constexpr int kTitleRowVerticalPadding = 4;
 constexpr int kTitleRowProgressBarHeight = 2;
-constexpr int kTitleRowPaddingTop = kTitleRowVerticalPadding;
-constexpr int kTitleRowPaddingBottom =
-    kTitleRowVerticalPadding - kTitleRowProgressBarHeight;
 
 extern const SkColor kMobileNotConnectedXIconColor;
 
@@ -105,10 +87,6 @@ extern const int kTrayIconBackgroundAlpha;
 constexpr int kTrayNetworkIconPadding = 2;
 constexpr int kUnifiedTrayNetworkIconPadding = 4;
 
-// The total visual padding at the start and end of the icon/label section
-// of the tray.
-constexpr int kTrayEdgePadding = 6;
-
 // The size and foreground color of the icons appearing in the material design
 // system menu.
 extern const int kMenuIconSize;
@@ -140,9 +118,6 @@ extern const int kTrayPopupInkDropInset;
 // The radius used to draw the corners of the rounded rect style ink drops.
 extern const int kTrayPopupInkDropCornerRadius;
 
-// The height of the system info row.
-extern const int kTrayPopupSystemInfoRowHeight;
-
 // The colors used when --enable-features=SystemTrayUnified flag is enabled.
 constexpr SkColor kUnifiedMenuBackgroundColor =
     SkColorSetARGB(0xf2, 0x20, 0x21, 0x24);
@@ -195,14 +170,8 @@ constexpr int kUnifiedNotificationMinimumHeight = 40;
 constexpr gfx::Insets kUnifiedTopShortcutPadding(0, 16);
 constexpr gfx::Insets kUnifiedNotificationHiddenPadding(6, 16);
 constexpr gfx::Insets kUnifiedCircularButtonFocusPadding(4);
-constexpr int kStackingNotificationCounterMax = 8;
-constexpr int kStackingNotificationCounterRadius = 2;
-constexpr int kStackingNotificationCounterStartX = 18;
-constexpr int kStackingNotificationCounterDistanceX = 10;
 constexpr int kStackingNotificationCounterHeight = 32;
 constexpr gfx::Insets kStackingNotificationClearAllButtonPadding(8, 16);
-constexpr SkColor kStackingNotificationCounterColor =
-    SkColorSetRGB(0x5f, 0x63, 0x68);
 constexpr SkColor kStackingNotificationCounterBorderColor =
     SkColorSetRGB(0xe0, 0xe0, 0xe0);
 constexpr SkColor kStackingNotificationCounterLabelColor =
@@ -261,10 +230,8 @@ constexpr int kUnifiedUserChooserSeparatorSideMargin = 64;
 // Additional gap above and below the longer separator between user list and
 // "Sign in another user..." button.
 constexpr int kUnifiedUserChooserLargeSeparatorVerticalSpacing = 8;
-//
+
 constexpr int kUnifiedUserChooserRowHeight = 64;
-constexpr int kUnifiedUserChooserAvatorIconColumnWidth = 64;
-constexpr int kUnifiedUserChooserCloseIconColumnWidth = 64;
 
 // Gap between the buttons on the top shortcut row, other than the
 // expand/collapse button.