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

ash/system/drive/tray_drive.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/drive/tray_drive.h"
 
 #include <vector>
 
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
+#include "ash/system/tray/system_tray_item.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_details_view.h"
 #include "ash/system/tray/tray_item_more.h"
 #include "ash/system/tray/tray_item_view.h"
 #include "ash/system/tray/tray_views.h"
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/stl_util.h"
 #include "grit/ash_resources.h"
@@ skipping 36 matching lines @@
   return list;
 }
 
 }
 
 namespace tray {
 
 
 class DriveDefaultView : public TrayItemMore {
  public:
-  DriveDefaultView(SystemTrayItem* owner,
+  DriveDefaultView(SystemTrayItem* tray,
                    const DriveOperationStatusList* list)
-      : TrayItemMore(owner, true) {
+      : TrayItemMore(tray, true) {
     ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
 
     SetImage(bundle.GetImageNamed(IDR_AURA_UBER_TRAY_DRIVE).ToImageSkia());
     Update(list);
   }
 
   virtual ~DriveDefaultView() {}
 
   void Update(const DriveOperationStatusList* list) {
     DCHECK(list);
     string16 label = GetTrayLabel(*list);
     SetLabel(label);
     SetAccessibleName(label);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DriveDefaultView);
 };
 
 class DriveDetailedView : public TrayDetailsView,
                           public ViewClickListener {
  public:
-  DriveDetailedView(SystemTrayItem* owner,
+  DriveDetailedView(SystemTrayItem* tray,
                     const DriveOperationStatusList* list)
-      : settings_(NULL),
+      : TrayDetailsView(tray),
+        settings_(NULL),
         in_progress_img_(NULL),
         done_img_(NULL),
         failed_img_(NULL) {
     in_progress_img_ = ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
         IDR_AURA_UBER_TRAY_DRIVE);
     done_img_ = ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
         IDR_AURA_UBER_TRAY_DRIVE_DONE);
     failed_img_ = ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
         IDR_AURA_UBER_TRAY_DRIVE_FAILED);
 
@@ skipping 243 matching lines @@
         GetLocalizedString(IDS_ASH_STATUS_TRAY_DRIVE_SETTINGS),
         gfx::Font::NORMAL);
     AddChildView(container);
     settings_ = container;
   }
 
   // Overridden from ViewClickListener.
   virtual void ClickedOn(views::View* sender) OVERRIDE {
     SystemTrayDelegate* delegate = Shell::GetInstance()->tray_delegate();
     if (sender == footer()->content()) {
-      Shell::GetInstance()->system_tray()->ShowDefaultView(BUBBLE_USE_EXISTING);
+      tray()->system_tray()->ShowDefaultView(BUBBLE_USE_EXISTING);
     } else if (sender == settings_) {
       delegate->ShowDriveSettings();
     }
   }
 
   // Maps operation entries to their file paths.
   std::map<FilePath, RowView*> update_map_;
   views::View* settings_;
   gfx::ImageSkia* in_progress_img_;
   gfx::ImageSkia* done_img_;
   gfx::ImageSkia* failed_img_;
 
   DISALLOW_COPY_AND_ASSIGN(DriveDetailedView);
 };
 
 }  // namespace tray
 
-TrayDrive::TrayDrive() :
-    TrayImageItem(IDR_AURA_UBER_TRAY_DRIVE_LIGHT),
+TrayDrive::TrayDrive(SystemTray* system_tray) :
+    TrayImageItem(system_tray, IDR_AURA_UBER_TRAY_DRIVE_LIGHT),
     default_(NULL),
     detailed_(NULL) {
 }
 
 TrayDrive::~TrayDrive() {
 }
 
 bool TrayDrive::GetInitialVisibility() {
   scoped_ptr<DriveOperationStatusList> list(GetCurrentOperationList());
   return list->size() > 0;
@@ skipping 50 matching lines @@
 
   if (default_)
     default_->Update(&list);
 
   if (detailed_)
     detailed_->Update(&list);
 }
 
 }  // namespace internal
 }  // namespace ash