Give Ash material design tray items the correct size and layout

ash/system/user/tray_user.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/user/tray_user.h"
 
 #include "ash/common/ash_switches.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
@@ skipping 143 matching lines @@
       (need_label != (label_ != nullptr))) {
     layout_view_->RemoveAllChildViews(true);
     if (need_label) {
       label_ = new views::Label;
       SetupLabelForTray(label_);
       layout_view_->AddChildView(label_);
     } else {
       label_ = nullptr;
     }
     if (need_avatar) {
-      avatar_ = new tray::RoundedImageView(kTrayAvatarCornerRadius, true);
+      avatar_ = new tray::RoundedImageView(kTrayRoundedBorderRadius, true);
       layout_view_->AddChildView(avatar_);
     } else {
       avatar_ = nullptr;
     }
   }
 
   if (delegate->IsUserSupervised()) {
     label_->SetText(
         l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_SUPERVISED_LABEL));
   } else if (status == LoginStatus::GUEST) {
     label_->SetText(l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_GUEST_LABEL));
   }
 
   if (avatar_) {
-    avatar_->SetCornerRadii(0, kTrayAvatarCornerRadius, kTrayAvatarCornerRadius,
-                            0);
+    avatar_->SetCornerRadii(0, kTrayRoundedBorderRadius,
+                            kTrayRoundedBorderRadius, 0);
     avatar_->SetBorder(views::Border::NullBorder());
   }
   UpdateAvatarImage(status);
 
   // Update layout after setting label_ and avatar_ with new login status.
   UpdateLayoutOfItem();
 }
 
 void TrayUser::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
   // Inactive users won't have a layout.
   if (!layout_view_)
     return;
   if (IsHorizontalAlignment(alignment)) {
     if (avatar_) {
       avatar_->SetBorder(views::Border::NullBorder());
-      avatar_->SetCornerRadii(0, kTrayAvatarCornerRadius,
-                              kTrayAvatarCornerRadius, 0);
+      avatar_->SetCornerRadii(0, kTrayRoundedBorderRadius,
+                              kTrayRoundedBorderRadius, 0);
     }
     if (label_) {
       // If label_ hasn't figured out its size yet, do that first.
       if (label_->GetContentsBounds().height() == 0)
         label_->SizeToPreferredSize();
       int height = label_->GetContentsBounds().height();
       int vertical_pad = (kTrayItemSize - height) / 2;
       int remainder = height % 2;
       label_->SetBorder(views::Border::CreateEmptyBorder(
           vertical_pad + remainder,
           kTrayLabelItemHorizontalPaddingBottomAlignment, vertical_pad,
           kTrayLabelItemHorizontalPaddingBottomAlignment));
     }
     layout_view_->SetLayoutManager(new views::BoxLayout(
         views::BoxLayout::kHorizontal, 0, 0, kUserLabelToIconPadding));
   } else {
     if (avatar_) {
       avatar_->SetBorder(views::Border::NullBorder());
-      avatar_->SetCornerRadii(0, 0, kTrayAvatarCornerRadius,
-                              kTrayAvatarCornerRadius);
+      avatar_->SetCornerRadii(0, 0, kTrayRoundedBorderRadius,
+                              kTrayRoundedBorderRadius);
     }
     if (label_) {
       label_->SetBorder(views::Border::CreateEmptyBorder(
           kTrayLabelItemVerticalPaddingVerticalAlignment,
           kTrayLabelItemHorizontalPaddingBottomAlignment,
           kTrayLabelItemVerticalPaddingVerticalAlignment,
           kTrayLabelItemHorizontalPaddingBottomAlignment));
     }
     layout_view_->SetLayoutManager(new views::BoxLayout(
         views::BoxLayout::kVertical, 0, 0, kUserLabelToIconPadding));
@@ skipping 24 matching lines @@
   SessionStateDelegate* session_state_delegate =
       WmShell::Get()->GetSessionStateDelegate();
   if (!avatar_ ||
       user_index_ >= session_state_delegate->NumberOfLoggedInUsers())
     return;
 
   const user_manager::UserInfo* user_info =
       session_state_delegate->GetUserInfo(user_index_);
   CHECK(user_info);
   avatar_->SetImage(user_info->GetImage(),
-                    gfx::Size(kTrayAvatarSize, kTrayAvatarSize));
+                    gfx::Size(kTrayItemSize, kTrayItemSize));
 
   // Unit tests might come here with no images for some users.
   if (avatar_->size().IsEmpty())
-    avatar_->SetSize(gfx::Size(kTrayAvatarSize, kTrayAvatarSize));
+    avatar_->SetSize(gfx::Size(kTrayItemSize, kTrayItemSize));
 }
 
 void TrayUser::UpdateLayoutOfItem() {
   UpdateAfterShelfAlignmentChange(system_tray()->shelf_alignment());
 }
 
 }  // namespace ash