Revert of Ash:Shelf - Cleanup of Alternate Shelf (part 1)

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 05aa78b77b31b4eff536db80ca4b48a8186dffe4..26f8204f337163c696e8e5675ae920c9df054748 100644
--- a/ash/system/user/tray_user.cc
+++ b/ash/system/user/tray_user.cc
@@ -1287,7 +1287,7 @@
     label_->SetText(bundle.GetLocalizedString(IDS_ASH_STATUS_TRAY_GUEST_LABEL));
   }
 
-  if (avatar_) {
+  if (avatar_ && switches::UseAlternateShelfLayout()) {
     int corner_radius = GetTrayItemRadius();
     avatar_->SetCornerRadii(0, corner_radius, corner_radius, 0);
     avatar_->SetBorder(views::Border::NullBorder());
@@ -1306,13 +1306,21 @@
   if (alignment == SHELF_ALIGNMENT_BOTTOM ||
       alignment == SHELF_ALIGNMENT_TOP) {
     if (avatar_) {
-      if (multiprofile_index_) {
-        avatar_->SetBorder(
-            views::Border::CreateEmptyBorder(0, kTrayLabelSpacing, 0, 0));
+      if (switches::UseAlternateShelfLayout()) {
+        if (multiprofile_index_) {
+          avatar_->SetBorder(
+              views::Border::CreateEmptyBorder(0, kTrayLabelSpacing, 0, 0));
+        } else {
+          avatar_->SetBorder(views::Border::NullBorder());
+        }
+        avatar_->SetCornerRadii(0, corner_radius, corner_radius, 0);
       } else {
-        avatar_->SetBorder(views::Border::NullBorder());
+        avatar_->SetBorder(views::Border::CreateEmptyBorder(
+            0,
+            kTrayImageItemHorizontalPaddingBottomAlignment + 2,
+            0,
+            kTrayImageItemHorizontalPaddingBottomAlignment));
       }
-      avatar_->SetCornerRadii(0, corner_radius, corner_radius, 0);
     }
     if (label_) {
       label_->SetBorder(views::Border::CreateEmptyBorder(
@@ -1326,13 +1334,17 @@
                              0, 0, kUserLabelToIconPadding));
   } else {
     if (avatar_) {
-      if (multiprofile_index_) {
-        avatar_->SetBorder(
-            views::Border::CreateEmptyBorder(kTrayLabelSpacing, 0, 0, 0));
+      if (switches::UseAlternateShelfLayout()) {
+        if (multiprofile_index_) {
+          avatar_->SetBorder(
+              views::Border::CreateEmptyBorder(kTrayLabelSpacing, 0, 0, 0));
+        } else {
+          avatar_->SetBorder(views::Border::NullBorder());
+        }
+        avatar_->SetCornerRadii(0, 0, corner_radius, corner_radius);
       } else {
-        avatar_->SetBorder(views::Border::NullBorder());
+        SetTrayImageItemBorder(avatar_, alignment);
       }
-      avatar_->SetCornerRadii(0, 0, corner_radius, corner_radius);
     }
     if (label_) {
       label_->SetBorder(views::Border::CreateEmptyBorder(
@@ -1374,7 +1386,8 @@
       GetTrayIndex() >= session_state_delegate->NumberOfLoggedInUsers())
     return;
 
-  int icon_size = kUserIconLargeSize;
+  int icon_size = switches::UseAlternateShelfLayout() ?
+      kUserIconLargeSize : kUserIconSize;
 
   avatar_->SetImage(
       Shell::GetInstance()->session_state_delegate()->GetUserImage(