Consolidate some more ash tray constants.

ash/common/system/user/user_card_view.cc

 // Copyright 2014 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/user/user_card_view.h"
 
 #include <algorithm>
 #include <memory>
 #include <vector>
 
@@ skipping 50 matching lines @@
   if (login_status == LoginStatus::GUEST) {
     gfx::ImageSkia icon =
         gfx::CreateVectorIcon(kSystemMenuGuestIcon, kMenuIconColor);
     image_view->SetImage(icon, icon.size());
   } else {
     SessionStateDelegate* delegate = WmShell::Get()->GetSessionStateDelegate();
     image_view->SetImage(delegate->GetUserInfo(user_index)->GetImage(),
                          gfx::Size(kTrayItemSize, kTrayItemSize));
   }
 
-  image_view->SetBorder(views::CreateEmptyBorder(
-      gfx::Insets((GetTrayConstant(TRAY_POPUP_ITEM_MAIN_IMAGE_CONTAINER_WIDTH) -
-                   image_view->GetPreferredSize().width()) /
-                  2)));
+  image_view->SetBorder(views::CreateEmptyBorder(gfx::Insets(
+      (kTrayPopupItemMinStartWidth - image_view->GetPreferredSize().width()) /
+      2)));
   return image_view;
 }
 
 // The user details shown in public account mode. This is essentially a label
 // but with custom painting code as the text is styled with multiple colors and
 // contains a link.
 class PublicAccountUserDetails : public views::View,
                                  public views::LinkListener {
  public:
   PublicAccountUserDetails(int max_width);
@@ skipping 204 matching lines @@
 UserCardView::UserCardView(LoginStatus login_status,
                            int max_width,
                            int user_index)
     : user_index_(user_index),
       user_name_(nullptr),
       media_capture_label_(nullptr),
       media_capture_icon_(nullptr) {
   auto layout = new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0,
                                      kTrayPopupLabelHorizontalPadding);
   SetLayoutManager(layout);
-  layout->set_minimum_cross_axis_size(
-      GetTrayConstant(TRAY_POPUP_ITEM_MIN_HEIGHT));
+  layout->set_minimum_cross_axis_size(kTrayPopupItemMinHeight);
   layout->set_cross_axis_alignment(
       views::BoxLayout::CROSS_AXIS_ALIGNMENT_CENTER);
   // For active users, the left inset is provided by ActiveUserBorder, which
   // is necessary to make sure the ripple does not cover that part of the row.
   // For inactive users, we set the inset here and this causes the ripple to
   // extend all the way to the edges of the menu.
   if (!is_active_user())
     SetBorder(views::CreateEmptyBorder(0, kMenuExtraMarginFromLeftEdge, 0, 0));
 
   WmShell::Get()->media_controller()->AddObserver(this);
@@ skipping 137 matching lines @@
     media_capture_label_ = new views::Label();
     media_capture_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     media_capture_label_->SetBorder(
         views::CreateEmptyBorder(0, 0, user_email_bottom_pad, 0));
     user_email_style.SetupLabel(media_capture_label_);
     stack_of_labels->AddChildView(media_capture_label_);
 
     media_capture_icon_ = new views::ImageView;
     media_capture_icon_->SetImage(
         gfx::CreateVectorIcon(kSystemTrayRecordingIcon, gfx::kGoogleRed700));
-    const int media_capture_width =
-        GetTrayConstant(TRAY_POPUP_ITEM_MIN_END_WIDTH);
+    const int media_capture_width = kTrayPopupItemMinEndWidth;
     media_capture_icon_->SetBorder(views::CreateEmptyBorder(
         gfx::Insets(0, (media_capture_width -
                         media_capture_icon_->GetPreferredSize().width()) /
                            2)));
 
     media_capture_icon_->set_id(VIEW_ID_USER_VIEW_MEDIA_INDICATOR);
     AddChildView(media_capture_icon_);
 
     WmShell::Get()->media_controller()->RequestCaptureState();
   }
 }
 
 }  // namespace tray
 }  // namespace ash