Consolidate some more ash tray constants.

ash/common/system/chromeos/ime_menu/ime_menu_tray.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/chromeos/ime_menu/ime_menu_tray.h"
 
 #include "ash/common/accessibility_delegate.h"
 #include "ash/common/ash_constants.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/session/session_state_delegate.h"
@@ skipping 36 matching lines @@
 
 using chromeos::input_method::InputMethodManager;
 
 namespace ash {
 
 namespace {
 // Returns the height range of ImeListView.
 gfx::Range GetImeListViewRange() {
   const int max_items = 5;
   const int min_items = 1;
-  const int tray_item_height = GetTrayConstant(TRAY_POPUP_ITEM_MIN_HEIGHT);
+  const int tray_item_height = kTrayPopupItemMinHeight;
   return gfx::Range(tray_item_height * min_items, tray_item_height * max_items);
 }
 
 // Returns the minimum with of IME menu.
 int GetMinimumMenuWidth() {
   return MaterialDesignController::IsSystemTrayMenuMaterial()
              ? kTrayMenuMinimumWidthMd
              : kTrayMenuMinimumWidth;
 }
 
@@ skipping 38 matching lines @@
          ui::TEXT_INPUT_TYPE_PASSWORD;
 }
 
 class ImeMenuLabel : public views::Label {
  public:
   ImeMenuLabel() {}
   ~ImeMenuLabel() override {}
 
   // views:Label:
   gfx::Size GetPreferredSize() const override {
-    const int tray_constant = GetTrayConstant(TRAY_IME_MENU_ICON);
-    return gfx::Size(tray_constant, tray_constant);
+    return gfx::Size(kTrayItemSize, kTrayItemSize);
   }
-  int GetHeightForWidth(int width) const override {
-    return GetTrayConstant(TRAY_IME_MENU_ICON);
-  }
+  int GetHeightForWidth(int width) const override { return kTrayItemSize; }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ImeMenuLabel);
 };
 
 SystemMenuButton* CreateImeMenuButton(views::ButtonListener* listener,
                                       const gfx::VectorIcon& icon,
                                       int accessible_name_id,
                                       int right_border) {
   SystemMenuButton* button = new SystemMenuButton(
       listener, TrayPopupInkDropStyle::HOST_CENTERED, icon, accessible_name_id);
   if (!MaterialDesignController::IsShelfMaterial()) {
     button->SetBorder(
         views::CreateSolidSidedBorder(0, 0, 0, right_border, kBorderDarkColor));
   }
   return button;
 }
 
 // The view that contains IME menu title in the material design.
 class ImeTitleView : public views::View, public views::ButtonListener {
  public:
   explicit ImeTitleView(bool show_settings_button) : settings_button_(nullptr) {
     SetBorder(views::CreatePaddedBorder(
         views::CreateSolidSidedBorder(0, 0, kSeparatorWidth, 0,
                                       kMenuSeparatorColor),
         gfx::Insets(kMenuSeparatorVerticalPadding - kSeparatorWidth, 0)));
     auto* box_layout =
         new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0);
-    box_layout->set_minimum_cross_axis_size(
-        GetTrayConstant(TRAY_POPUP_ITEM_MIN_HEIGHT));
+    box_layout->set_minimum_cross_axis_size(kTrayPopupItemMinHeight);
     SetLayoutManager(box_layout);
     auto title_label =
         new views::Label(l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_IME));
     title_label->SetBorder(
         views::CreateEmptyBorder(0, kMenuEdgeEffectivePadding, 1, 0));
     title_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     TrayPopupItemStyle style(TrayPopupItemStyle::FontStyle::TITLE);
     style.SetupLabel(title_label);
 
     AddChildView(title_label);
@@ skipping 108 matching lines @@
   }
 
   // Shows the UI of more than one buttons.
   void ShowButtons(bool show_emoji_button,
                    bool show_handwriting_button,
                    bool show_voice_button,
                    bool show_settings_button) {
     if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
       auto* box_layout =
           new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0);
-      box_layout->set_minimum_cross_axis_size(
-          GetTrayConstant(TRAY_POPUP_ITEM_MIN_HEIGHT));
+      box_layout->set_minimum_cross_axis_size(kTrayPopupItemMinHeight);
       SetLayoutManager(box_layout);
       SetBorder(views::CreatePaddedBorder(
           views::CreateSolidSidedBorder(kSeparatorWidth, 0, 0, 0,
                                         kMenuSeparatorColor),
           gfx::Insets(kMenuSeparatorVerticalPadding - kSeparatorWidth,
-                      GetTrayConstant(TRAY_POPUP_ITEM_LEFT_INSET))));
+                      kMenuExtraMarginFromLeftEdge)));
     } else {
       auto* box_layout =
           new views::BoxLayout(views::BoxLayout::kHorizontal, 4, 4, 0);
       set_background(
           views::Background::CreateSolidBackground(kHeaderBackgroundColor));
       box_layout->SetDefaultFlex(1);
       SetLayoutManager(box_layout);
     }
 
     const int right_border = 1;
@@ skipping 350 matching lines @@
   WmShell::Get()->system_tray_delegate()->GetCurrentIME(&current_ime_);
 
   // Updates the tray label based on the current input method.
   if (current_ime_.third_party)
     label_->SetText(current_ime_.short_name + base::UTF8ToUTF16("*"));
   else
     label_->SetText(current_ime_.short_name);
 }
 
 }  // namespace ash