Some more fixes to cros system tray icons (esp. screen tray items)

ash/common/system/cast/tray_cast.cc

 // Copyright 2015 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/cast/tray_cast.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/common/system/chromeos/screen_security/screen_tray_item.h"
@@ skipping 330 matching lines @@
     return select_view_;
   return nullptr;
 }
 
 // Exposes an icon in the tray. |TrayCast| manages the visiblity of this.
 class CastTrayView : public TrayItemView {
  public:
   explicit CastTrayView(SystemTrayItem* tray_item);
   ~CastTrayView() override;
 
-  // Called when the tray alignment changes so that the icon can recenter
-  // itself.
-  void UpdateAlignment(ShelfAlignment alignment);
-
  private:
   DISALLOW_COPY_AND_ASSIGN(CastTrayView);
 };
 
 CastTrayView::CastTrayView(SystemTrayItem* tray_item)
     : TrayItemView(tray_item) {
   CreateImageView();
   if (MaterialDesignController::UseMaterialDesignSystemIcons()) {
     image_view()->SetImage(
         gfx::CreateVectorIcon(kSystemTrayCastIcon, kTrayIconColor));
   } else {
     image_view()->SetImage(ui::ResourceBundle::GetSharedInstance()
                                .GetImageNamed(IDR_AURA_UBER_TRAY_SCREENSHARE)
                                .ToImageSkia());
   }
 }
 
 CastTrayView::~CastTrayView() {}
 
-void CastTrayView::UpdateAlignment(ShelfAlignment alignment) {
-  // Center the item dependent on the orientation of the shelf.
-  views::BoxLayout::Orientation layout = IsHorizontalAlignment(alignment)
-                                             ? views::BoxLayout::kHorizontal
-                                             : views::BoxLayout::kVertical;
-  SetLayoutManager(new views::BoxLayout(layout, 0, 0, 0));
-  Layout();
-}
-
 // This view displays a list of cast receivers that can be clicked on and casted
 // to. It is activated by clicking on the chevron inside of
 // |CastSelectDefaultView|.
 class CastDetailedView : public TrayDetailsView {
  public:
   CastDetailedView(SystemTrayItem* owner,
                    LoginStatus login,
                    const CastConfigDelegate::ReceiversAndActivities&
                        receivers_and_activities);
   ~CastDetailedView() override;
@@ skipping 281 matching lines @@
     if (tray_)
       tray_->SetVisible(false);
   }
 }
 
 void TrayCast::OnCastingSessionStartedOrStopped(bool started) {
   is_casting_ = started;
   UpdatePrimaryView();
 }
 
-void TrayCast::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
-  if (tray_)
-    tray_->UpdateAlignment(alignment);
-}
-
 }  // namespace ash