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

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 <algorithm>
 #include <climits>
 #include <vector>
 
@@ skipping 1269 matching lines @@
   }
 
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
   if (status == user::LOGGED_IN_LOCALLY_MANAGED) {
     label_->SetText(
         bundle.GetLocalizedString(IDS_ASH_STATUS_TRAY_LOCALLY_MANAGED_LABEL));
   } else if (status == user::LOGGED_IN_GUEST) {
     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());
   }
   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;
   int corner_radius = GetTrayItemRadius();
   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(
           0,
           kTrayLabelItemHorizontalPaddingBottomAlignment,
           0,
           kTrayLabelItemHorizontalPaddingBottomAlignment));
     }
     layout_view_->SetLayoutManager(
         new views::BoxLayout(views::BoxLayout::kHorizontal,
                              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(
           kTrayLabelItemVerticalPaddingVerticalAlignment,
           kTrayLabelItemHorizontalPaddingBottomAlignment,
           kTrayLabelItemVerticalPaddingVerticalAlignment,
           kTrayLabelItemHorizontalPaddingBottomAlignment));
     }
     layout_view_->SetLayoutManager(
         new views::BoxLayout(views::BoxLayout::kVertical,
@@ skipping 21 matching lines @@
       Shell::GetInstance()->system_tray_delegate()->GetUserLoginStatus());
 }
 
 void TrayUser::UpdateAvatarImage(user::LoginStatus status) {
   SessionStateDelegate* session_state_delegate =
       Shell::GetInstance()->session_state_delegate();
   if (!avatar_ ||
       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(
           GetTrayIndex()),
       gfx::Size(icon_size, icon_size));
 
   // Unit tests might come here with no images for some users.
   if (avatar_->size().IsEmpty())
     avatar_->SetSize(gfx::Size(icon_size, icon_size));
 }
@@ skipping 21 matching lines @@
       internal::GetRootWindowController(
           system_tray()->GetWidget()->GetNativeWindow()->GetRootWindow());
   if (controller && controller->shelf()) {
     UpdateAfterShelfAlignmentChange(
         controller->GetShelfLayoutManager()->GetAlignment());
   }
 }
 
 }  // namespace internal
 }  // namespace ash