Stop using shell::GetInstance()->system_tray() in system tray items

ash/system/tray/tray_item_view.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/tray/tray_item_view.h"
 
-#include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
+#include "ash/system/tray/system_tray_item.h"
 #include "ash/wm/shelf_types.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/compositor/layer.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 const int kTrayIconHeight = 29;
 const int kTrayIconWidth = 29;
 const int kTrayItemAnimationDurationMS = 200;
 }
 
 namespace ash {
 namespace internal {
 
-TrayItemView::TrayItemView()
-    : label_(NULL),
+TrayItemView::TrayItemView(SystemTrayItem* owner)
+    : owner_(owner),
+      label_(NULL),
       image_view_(NULL) {
   SetPaintToLayer(true);
   SetFillsBoundsOpaquely(false);
   SetLayoutManager(
       new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0));
 }
 
 TrayItemView::~TrayItemView() {}
 
 void TrayItemView::CreateLabel() {
@@ skipping 32 matching lines @@
 gfx::Size TrayItemView::DesiredSize() {
   return views::View::GetPreferredSize();
 }
 
 int TrayItemView::GetAnimationDurationMS() {
   return kTrayItemAnimationDurationMS;
 }
 
 gfx::Size TrayItemView::GetPreferredSize() {
   gfx::Size size = DesiredSize();
-  if (ash::Shell::GetInstance()->system_tray()->shelf_alignment() ==
-      SHELF_ALIGNMENT_BOTTOM)
+  if (owner()->system_tray()->shelf_alignment() == SHELF_ALIGNMENT_BOTTOM)
     size.set_height(kTrayIconHeight);
   else
     size.set_width(kTrayIconWidth);
   if (!animation_.get() || !animation_->is_animating())
     return size;
   size.set_width(std::max(1,
       static_cast<int>(size.width() * animation_->GetCurrentValue())));
   return size;
 }
 
@@ skipping 15 matching lines @@
   if (animation->GetCurrentValue() < 0.1)
     views::View::SetVisible(false);
 }
 
 void TrayItemView::AnimationCanceled(const ui::Animation* animation) {
   AnimationEnded(animation);
 }
 
 }  // namespace internal
 }  // namespace ash