Give Ash material design tray items the correct size and layout

ash/system/user/tray_user.cc

Index: ash/system/user/tray_user.cc
diff --git a/ash/system/user/tray_user.cc b/ash/system/user/tray_user.cc
index 7df540de6c270eb3ca71f5a6db328e70b8fa199e..379392376c9adbd7bb697192e29ee8c7d5334419 100644
--- a/ash/system/user/tray_user.cc
+++ b/ash/system/user/tray_user.cc
@@ -161,7 +161,7 @@ void TrayUser::UpdateAfterLoginStatusChange(LoginStatus status) {
       label_ = nullptr;
     }
     if (need_avatar) {
-      avatar_ = new tray::RoundedImageView(kTrayAvatarCornerRadius, true);
+      avatar_ = new tray::RoundedImageView(kTrayRoundedBorderRadius, true);
       layout_view_->AddChildView(avatar_);
     } else {
       avatar_ = nullptr;
@@ -176,8 +176,8 @@ void TrayUser::UpdateAfterLoginStatusChange(LoginStatus status) {
   }
 
   if (avatar_) {
-    avatar_->SetCornerRadii(0, kTrayAvatarCornerRadius, kTrayAvatarCornerRadius,
-                            0);
+    avatar_->SetCornerRadii(0, kTrayRoundedBorderRadius,
+                            kTrayRoundedBorderRadius, 0);
     avatar_->SetBorder(views::Border::NullBorder());
   }
   UpdateAvatarImage(status);
@@ -193,8 +193,8 @@ void TrayUser::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
   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.
@@ -213,8 +213,8 @@ void TrayUser::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
   } 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(
@@ -259,11 +259,11 @@ void TrayUser::UpdateAvatarImage(LoginStatus status) {
       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() {