Shelf Cleanup AlternateShelfLayout P1 Attempt 3

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/ash_switches.h"
 #include "ash/root_window_controller.h"
 #include "ash/session_state_delegate.h"
 #include "ash/shelf/shelf_layout_manager.h"
@@ skipping 15 matching lines @@
 #include "ui/views/border.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 
 const int kUserLabelToIconPadding = 5;
 
-const int kTrayAvatarLargeSize = 32;
-const int kTrayAvatarLargeCornerRadius = 2;
-
 }  // namespace
 
 namespace ash {
 
 TrayUser::TrayUser(SystemTray* system_tray, MultiProfileIndex index)
     : SystemTrayItem(system_tray),
       multiprofile_index_(index),
       user_(NULL),
       layout_view_(NULL),
       avatar_(NULL),
@@ skipping 124 matching lines @@
     }
   }
 
   if (status == user::LOGGED_IN_LOCALLY_MANAGED) {
     label_->SetText(
         l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_LOCALLY_MANAGED_LABEL));
   } else if (status == user::LOGGED_IN_GUEST) {
     label_->SetText(l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_GUEST_LABEL));
   }
 
-  if (avatar_ && switches::UseAlternateShelfLayout()) {
+  if (avatar_) {
     avatar_->SetCornerRadii(
-        0, kTrayAvatarLargeCornerRadius, kTrayAvatarLargeCornerRadius, 0);
+        0, kTrayAvatarCornerRadius, kTrayAvatarCornerRadius, 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 (alignment == SHELF_ALIGNMENT_BOTTOM ||
       alignment == SHELF_ALIGNMENT_TOP) {
     if (avatar_) {
-      if (switches::UseAlternateShelfLayout()) {
-        avatar_->SetBorder(views::Border::NullBorder());
-        avatar_->SetCornerRadii(
-            0, kTrayAvatarLargeCornerRadius, kTrayAvatarLargeCornerRadius, 0);
-      } else {
-        avatar_->SetBorder(views::Border::CreateEmptyBorder(
-            0,
-            kTrayImageItemHorizontalPaddingBottomAlignment + 2,
-            0,
-            kTrayImageItemHorizontalPaddingBottomAlignment));
-      }
+      avatar_->SetBorder(views::Border::NullBorder());
+      avatar_->SetCornerRadii(
+          0, kTrayAvatarCornerRadius, kTrayAvatarCornerRadius, 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_) {
-      if (switches::UseAlternateShelfLayout()) {
-        avatar_->SetBorder(views::Border::NullBorder());
-        avatar_->SetCornerRadii(
-            0, 0, kTrayAvatarLargeCornerRadius, kTrayAvatarLargeCornerRadius);
-      } else {
-        SetTrayImageItemBorder(avatar_, alignment);
-      }
+      avatar_->SetBorder(views::Border::NullBorder());
+      avatar_->SetCornerRadii(
+          0, 0, kTrayAvatarCornerRadius, kTrayAvatarCornerRadius);
     }
     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 = switches::UseAlternateShelfLayout() ? kTrayAvatarLargeSize
-                                                      : kTrayAvatarSize;
-
   content::BrowserContext* context = session_state_delegate->
       GetBrowserContextByIndex(GetTrayIndex());
   avatar_->SetImage(session_state_delegate->GetUserImage(context),
-                    gfx::Size(icon_size, icon_size));
+                    gfx::Size(kTrayAvatarSize, kTrayAvatarSize));
 
   // Unit tests might come here with no images for some users.
   if (avatar_->size().IsEmpty())
-    avatar_->SetSize(gfx::Size(icon_size, icon_size));
+    avatar_->SetSize(gfx::Size(kTrayAvatarSize, kTrayAvatarSize));
 }
 
 MultiProfileIndex TrayUser::GetTrayIndex() {
   Shell* shell = Shell::GetInstance();
   // If multi profile is not enabled we can use the normal index.
   if (!shell->delegate()->IsMultiProfilesEnabled())
     return multiprofile_index_;
   // In case of multi profile we need to mirror the indices since the system
   // tray items are in the reverse order then the menu items.
   return shell->session_state_delegate()->GetMaximumNumberOfLoggedInUsers() -
              1 - multiprofile_index_;
 }
 
 void TrayUser::UpdateLayoutOfItem() {
   RootWindowController* controller = GetRootWindowController(
       system_tray()->GetWidget()->GetNativeWindow()->GetRootWindow());
   if (controller && controller->shelf()) {
     UpdateAfterShelfAlignmentChange(
         controller->GetShelfLayoutManager()->GetAlignment());
   }
 }
 
 }  // namespace ash