Revert of Shelf Cleanup (- binary files)

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 54 matching lines @@
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/mouse_watcher.h"
 #include "ui/views/painter.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 
 const int kUserDetailsVerticalPadding = 5;
 const int kUserCardVerticalPadding = 10;
-const int kUserIconSize = 32;
-const int kUserIconCornerRadius = 2;
+const int kProfileRoundedCornerRadius = 2;
+const int kUserIconSize = 27;
+const int kUserIconLargeSize = 32;
+const int kUserIconLargeCornerRadius = 2;
 const int kUserLabelToIconPadding = 5;
 
 // When a hover border is used, it is starting this many pixels before the icon
 // position.
 const int kTrayUserTileHoverBorderInset = 10;
 
 // The border color of the user button.
 const SkColor kBorderColor = 0xffdcdcdc;
 
 // The invisible word joiner character, used as a marker to indicate the start
@@ skipping 817 matching lines @@
     user_card_view_->AddChildView(details);
   } else {
     if (username)
       user_card_view_->AddChildView(username);
     if (additional)
       user_card_view_->AddChildView(additional);
   }
 }
 
 views::View* UserView::CreateIconForUserCard(user::LoginStatus login) {
-  RoundedImageView* icon = new RoundedImageView(kUserIconCornerRadius,
+  RoundedImageView* icon = new RoundedImageView(kProfileRoundedCornerRadius,
                                                 multiprofile_index_ == 0);
   icon->SetEnabled(false);
   if (login == user::LOGGED_IN_GUEST) {
     icon->SetImage(*ui::ResourceBundle::GetSharedInstance().
         GetImageNamed(IDR_AURA_UBER_TRAY_GUEST_ICON).ToImageSkia(),
         gfx::Size(kUserIconSize, kUserIconSize));
   } else {
     icon->SetImage(
         Shell::GetInstance()->session_state_delegate()->
             GetUserImage(multiprofile_index_),
@@ skipping 141 matching lines @@
       kTrayPopupPaddingHorizontal - kTrayUserTileHoverBorderInset,
       kUserCardVerticalPadding,
       kTrayPopupPaddingHorizontal - kTrayUserTileHoverBorderInset));
 
   add_user_->SetLayoutManager(new views::BoxLayout(
       views::BoxLayout::kHorizontal, 0, 0 , kTrayPopupPaddingBetweenItems));
   AddChildViewAt(add_user_, 0);
 
   // Add the [+] icon which is also the anchor for messages.
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
-  RoundedImageView* icon = new RoundedImageView(kUserIconCornerRadius,
+  RoundedImageView* icon = new RoundedImageView(kProfileRoundedCornerRadius,
                                                 true);
   anchor_ = icon;
   icon->SetImage(*ui::ResourceBundle::GetSharedInstance().
       GetImageNamed(IDR_AURA_UBER_TRAY_ADD_MULTIPROFILE_USER).ToImageSkia(),
       gfx::Size(kUserIconSize, kUserIconSize));
   add_user_->AddChildView(icon);
 
   // Add the command text.
   views::Label* command_label = new views::Label(
       bundle.GetLocalizedString(IDS_ASH_STATUS_TRAY_SIGN_IN_ANOTHER_ACCOUNT));
@@ skipping 110 matching lines @@
       (need_label != (label_ != NULL))) {
     layout_view_->RemoveAllChildViews(true);
     if (need_label) {
       label_ = new views::Label;
       SetupLabelForTray(label_);
       layout_view_->AddChildView(label_);
     } else {
       label_ = NULL;
     }
     if (need_avatar) {
-      avatar_ = new tray::RoundedImageView(kUserIconCornerRadius, true);
+      avatar_ = new tray::RoundedImageView(kProfileRoundedCornerRadius, true);
       layout_view_->AddChildView(avatar_);
     } else {
       avatar_ = NULL;
     }
   }
 
   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()) {
     avatar_->SetCornerRadii(
-        0, kUserIconCornerRadius, kUserIconCornerRadius, 0);
+        0, kUserIconLargeCornerRadius, kUserIconLargeCornerRadius, 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_) {
-      avatar_->SetBorder(views::Border::NullBorder());
-      avatar_->SetCornerRadii(
-          0, kUserIconCornerRadius, kUserIconCornerRadius, 0);
+      if (switches::UseAlternateShelfLayout()) {
+        avatar_->SetBorder(views::Border::NullBorder());
+        avatar_->SetCornerRadii(
+            0, kUserIconLargeCornerRadius, kUserIconLargeCornerRadius, 0);
+      } else {
+        avatar_->SetBorder(views::Border::CreateEmptyBorder(
+            0,
+            kTrayImageItemHorizontalPaddingBottomAlignment + 2,
+            0,
+            kTrayImageItemHorizontalPaddingBottomAlignment));
+      }
     }
     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_) {
-      avatar_->SetBorder(views::Border::NullBorder());
-      avatar_->SetCornerRadii(
-          0, 0, kUserIconCornerRadius, kUserIconCornerRadius);
+      if (switches::UseAlternateShelfLayout()) {
+        avatar_->SetBorder(views::Border::NullBorder());
+        avatar_->SetCornerRadii(
+            0, 0, kUserIconLargeCornerRadius, kUserIconLargeCornerRadius);
+      } else {
+        SetTrayImageItemBorder(avatar_, alignment);
+      }
     }
     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() ?
+      kUserIconLargeSize : kUserIconSize;
+
   avatar_->SetImage(
       Shell::GetInstance()->session_state_delegate()->GetUserImage(
           GetTrayIndex()),
-      gfx::Size(kUserIconSize, kUserIconSize));
+      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(kUserIconSize, kUserIconSize));
+    avatar_->SetSize(gfx::Size(icon_size, icon_size));
 }
 
 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() {
   internal::RootWindowController* controller =
       internal::GetRootWindowController(
           system_tray()->GetWidget()->GetNativeWindow()->GetRootWindow());
   if (controller && controller->shelf()) {
     UpdateAfterShelfAlignmentChange(
         controller->GetShelfLayoutManager()->GetAlignment());
   }
 }
 
 }  // namespace internal
 }  // namespace ash