Consolidate some more ash tray constants.

ash/common/system/tray/tray_popup_utils.cc

 // Copyright 2016 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/common/system/tray/tray_popup_utils.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "ash/common/ash_constants.h"
@@ skipping 68 matching lines @@
   return nullptr;
 }
 
 // Configures the default size and flex value for the specified |container|
 // of the given |tri_view|. Used by CreateDefaultRowView().
 void ConfigureDefaultSizeAndFlex(TriView* tri_view,
                                  TriView::Container container) {
   int min_width = 0;
   switch (container) {
     case TriView::Container::START:
-      min_width = GetTrayConstant(TRAY_POPUP_ITEM_MIN_START_WIDTH);
+      min_width = kTrayPopupItemMinStartWidth;
       break;
     case TriView::Container::CENTER:
       tri_view->SetFlexForContainer(TriView::Container::CENTER, 1.f);
       break;
     case TriView::Container::END:
-      min_width = GetTrayConstant(TRAY_POPUP_ITEM_MIN_END_WIDTH);
+      min_width = kTrayPopupItemMinEndWidth;
       break;
   }
 
-  tri_view->SetMinSize(
+  tri_view->SetMinSize(container,
+                       gfx::Size(min_width, kTrayPopupItemMinHeight));
+  constexpr int kTrayPopupItemMaxHeight = 144;
+  tri_view->SetMaxSize(
       container,
-      gfx::Size(min_width, GetTrayConstant(TRAY_POPUP_ITEM_MIN_HEIGHT)));
-  tri_view->SetMaxSize(container,
-                       gfx::Size(SizeRangeLayout::kAbsoluteMaxSize,
-                                 GetTrayConstant(TRAY_POPUP_ITEM_MAX_HEIGHT)));
+      gfx::Size(SizeRangeLayout::kAbsoluteMaxSize, kTrayPopupItemMaxHeight));
 }
 
 class BorderlessLabelButton : public views::LabelButton {
  public:
   BorderlessLabelButton(views::ButtonListener* listener,
                         const base::string16& text)
       : LabelButton(listener, text) {
     const int kHorizontalPadding = 20;
     SetBorder(views::CreateEmptyBorder(gfx::Insets(0, kHorizontalPadding)));
     TrayPopupItemStyle style(TrayPopupItemStyle::FontStyle::BUTTON);
@@ skipping 61 matching lines @@
   tri_view->SetContainerVisible(TriView::Container::START, false);
   tri_view->SetContainerLayout(
       TriView::Container::END,
       CreateDefaultLayoutManager(TriView::Container::END));
   return tri_view;
 }
 
 TriView* TrayPopupUtils::CreateMultiTargetRowView() {
   TriView* tri_view = new TriView(0 /* padding_between_items */);
 
-  tri_view->SetInsets(
-      gfx::Insets(0, GetTrayConstant(TRAY_POPUP_ITEM_LEFT_INSET), 0, 0));
+  tri_view->SetInsets(gfx::Insets(0, kMenuExtraMarginFromLeftEdge, 0, 0));
 
   ConfigureDefaultSizeAndFlex(tri_view, TriView::Container::START);
   ConfigureDefaultSizeAndFlex(tri_view, TriView::Container::CENTER);
   ConfigureDefaultSizeAndFlex(tri_view, TriView::Container::END);
 
   tri_view->SetContainerLayout(TriView::Container::START,
                                base::MakeUnique<views::FillLayout>());
   tri_view->SetContainerLayout(TriView::Container::CENTER,
                                base::MakeUnique<views::FillLayout>());
   tri_view->SetContainerLayout(TriView::Container::END,
@@ skipping 10 matching lines @@
   // Frequently the label will paint to a layer that's non-opaque, so subpixel
   // rendering won't work unless we explicitly set a background. See
   // crbug.com/686363
   label->set_background(
       views::Background::CreateSolidBackground(kBackgroundColor));
   label->SetBackgroundColor(kBackgroundColor);
   return label;
 }
 
 views::ImageView* TrayPopupUtils::CreateMainImageView() {
-  return new FixedSizedImageView(
-      GetTrayConstant(TRAY_POPUP_ITEM_MAIN_IMAGE_CONTAINER_WIDTH),
-      GetTrayConstant(TRAY_POPUP_ITEM_MIN_HEIGHT));
+  return new FixedSizedImageView(kTrayPopupItemMinStartWidth,
+                                 kTrayPopupItemMinHeight);
 }
 
 views::ImageView* TrayPopupUtils::CreateMoreImageView() {
   views::ImageView* image =
-      new FixedSizedImageView(GetTrayConstant(TRAY_POPUP_ITEM_MORE_IMAGE_SIZE),
-                              GetTrayConstant(TRAY_POPUP_ITEM_MORE_IMAGE_SIZE));
+      new FixedSizedImageView(kMenuIconSize, kMenuIconSize);
   image->EnableCanvasFlippingForRTLUI(true);
   return image;
 }
 
 views::Slider* TrayPopupUtils::CreateSlider(views::SliderListener* listener) {
   views::Slider* slider = new views::Slider(listener);
   slider->SetBorder(views::CreateEmptyBorder(gfx::Insets(0, 16)));
   return slider;
 }
 
@@ skipping 190 matching lines @@
 bool TrayPopupUtils::CanOpenWebUISettings(LoginStatus status) {
   // TODO(tdanderson): Consider moving this into WmShell, or introduce a
   // CanShowSettings() method in each delegate type that has a
   // ShowSettings() method.
   return status != LoginStatus::NOT_LOGGED_IN &&
          status != LoginStatus::LOCKED &&
          !WmShell::Get()->GetSessionStateDelegate()->IsInSecondaryLoginScreen();
 }
 
 }  // namespace ash