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

ash/common/system/chromeos/screen_security/screen_tray_item.cc

 // Copyright 2013 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/chromeos/screen_security/screen_tray_item.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/common/system/tray/fixed_sized_image_view.h"
 #include "ash/common/system/tray/tray_constants.h"
@@ skipping 165 matching lines @@
   Update();
 
   if (stop_callback_.is_null())
     return;
 
   base::Closure callback = stop_callback_;
   stop_callback_.Reset();
   callback.Run();
 }
 
+views::View* ScreenTrayItem::CreateTrayView(LoginStatus status) {
+  tray_view_ = new tray::ScreenTrayView(this);
+  return tray_view_;
+}
+
 void ScreenTrayItem::RecordStoppedFromDefaultViewMetric() {}
 
 void ScreenTrayItem::RecordStoppedFromNotificationViewMetric() {}
 
 void ScreenTrayItem::DestroyTrayView() {
   tray_view_ = NULL;
 }
 
 void ScreenTrayItem::DestroyDefaultView() {
   default_view_ = NULL;
 }
 
-void ScreenTrayItem::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
-  if (!tray_view_)
-    return;
-
-  // 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();
-}
-
 }  // namespace ash