Simplify layout of tray items and fix spacing for MD.

ash/common/system/tray/tray_image_item.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/common/system/tray/tray_image_item.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray/tray_constants.h"
@@ skipping 55 matching lines @@
 views::View* TrayImageItem::tray_view() {
   return tray_view_;
 }
 
 views::View* TrayImageItem::CreateTrayView(LoginStatus status) {
   CHECK(!tray_view_);
   tray_view_ = new TrayItemView(this);
   tray_view_->CreateImageView();
   UpdateImageOnImageView();
   tray_view_->SetVisible(GetInitialVisibility());
-  SetItemAlignment(system_tray()->shelf_alignment());
   return tray_view_;
 }
 
 views::View* TrayImageItem::CreateDefaultView(LoginStatus status) {
   return nullptr;
 }
 
 views::View* TrayImageItem::CreateDetailedView(LoginStatus status) {
   return nullptr;
 }
 
 void TrayImageItem::UpdateAfterLoginStatusChange(LoginStatus status) {}
 
 void TrayImageItem::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
   SetTrayImageItemBorder(tray_view_, alignment);
-  SetItemAlignment(alignment);
 }
 
 void TrayImageItem::DestroyTrayView() {
   tray_view_ = nullptr;
 }
 
 void TrayImageItem::DestroyDefaultView() {}
 
 void TrayImageItem::DestroyDetailedView() {}
 
 void TrayImageItem::SetIconColor(SkColor color) {
   icon_color_ = color;
   UpdateImageOnImageView();
 }
 
 void TrayImageItem::SetImageFromResourceId(int resource_id) {
   resource_id_ = resource_id;
   UpdateImageOnImageView();
 }
 
-void TrayImageItem::SetItemAlignment(ShelfAlignment alignment) {
-  // Center the item dependent on the orientation of the shelf.
-  views::BoxLayout::Orientation layout = IsHorizontalAlignment(alignment)
-                                             ? views::BoxLayout::kHorizontal
-                                             : views::BoxLayout::kVertical;
-  tray_view_->SetLayoutManager(new views::BoxLayout(layout, 0, 0, 0));
-  tray_view_->Layout();
-}
-
 void TrayImageItem::UpdateImageOnImageView() {
   if (!tray_view_)
     return;
 
   if (MaterialDesignController::UseMaterialDesignSystemIcons()) {
     tray_view_->image_view()->SetImage(gfx::CreateVectorIcon(
         ResourceIdToVectorIcon(resource_id_), kTrayIconSize, icon_color_));
   } else {
     tray_view_->image_view()->SetImage(ui::ResourceBundle::GetSharedInstance()
                                            .GetImageNamed(resource_id_)
                                            .ToImageSkia());
   }
 }
 
 }  // namespace ash