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

ash/system/bluetooth/tray_bluetooth.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/bluetooth/tray_bluetooth.h"
 
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/tray_constants.h"
@@ skipping 13 matching lines @@
 const int kDeviceListHeight = 276;
 }
 
 namespace ash {
 namespace internal {
 
 namespace tray {
 
 class BluetoothDefaultView : public TrayItemMore {
  public:
-  explicit BluetoothDefaultView(SystemTrayItem* owner)
-      : TrayItemMore(owner, true) {
+  explicit BluetoothDefaultView(SystemTrayItem* tray)

[bartfab (slow), 2012/11/16 15:01:35]

I renamed |owner| to |tray| here and elsewhere for consistency. Both names were
being used for the same thing in different classes.

[stevenjb, 2012/11/16 17:41:43]

Actually, sorry to push back on this, but "tray" implies "system tray" to me.
This should be "tray_item" or just "item" (or owner). tray()->system_tray()
below looks particularly confusing.

[bartfab (slow), 2012/11/16 18:45:34]

I picked |tray| over |owner| because it seems to have been chosen more often in
the past. But I agree that |owner| is cleaner. Done.

On 2012/11/16 17:41:43, stevenjb (chromium) wrote:

+      : TrayItemMore(tray, true) {
     ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
     SetImage(bundle.GetImageNamed(IDR_AURA_UBER_TRAY_BLUETOOTH).ToImageSkia());
     UpdateLabel();
   }
 
   virtual ~BluetoothDefaultView() {}
 
   void UpdateLabel() {
     ash::SystemTrayDelegate* delegate =
         ash::Shell::GetInstance()->tray_delegate();
     if (delegate->GetBluetoothAvailable()) {
       ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
       SetLabel(rb.GetLocalizedString(delegate->GetBluetoothEnabled() ?
           IDS_ASH_STATUS_TRAY_BLUETOOTH_ENABLED :
           IDS_ASH_STATUS_TRAY_BLUETOOTH_DISABLED));
       SetVisible(true);
     } else {
       SetVisible(false);
     }
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(BluetoothDefaultView);
 };
 
 class BluetoothDetailedView : public TrayDetailsView,
                               public ViewClickListener,
                               public views::ButtonListener {
  public:
-  explicit BluetoothDetailedView(user::LoginStatus login)
-      : login_(login),
+  BluetoothDetailedView(SystemTrayItem* tray, user::LoginStatus login)
+      : TrayDetailsView(tray),
+        login_(login),
         add_device_(NULL),
         toggle_bluetooth_(NULL) {
     BluetoothDeviceList list;
     Shell::GetInstance()->tray_delegate()->GetAvailableBluetoothDevices(&list);
     Update(list);
   }
 
   virtual ~BluetoothDetailedView() {}
 
   void Update(const BluetoothDeviceList& list) {
@@ skipping 91 matching lines @@
     container->SetEnabled(delegate->GetBluetoothAvailable());
     AddChildView(container);
     add_device_ = container;
   }
 
   // Overridden from ViewClickListener.
   virtual void ClickedOn(views::View* sender) OVERRIDE {
     ash::SystemTrayDelegate* delegate =
         ash::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 == add_device_) {
       if (!delegate->GetBluetoothEnabled())
         delegate->ToggleBluetooth();
       delegate->AddBluetoothDevice();
     } else {
       std::map<views::View*, std::string>::iterator find;
       find = device_map_.find(sender);
       if (find != device_map_.end()) {
         std::string device_id = find->second;
         delegate->ToggleBluetoothConnection(device_id);
@@ skipping 17 matching lines @@
   std::map<views::View*, std::string> device_map_;
   views::View* add_device_;
   TrayPopupHeaderButton* toggle_bluetooth_;
   views::View* settings_;
 
   DISALLOW_COPY_AND_ASSIGN(BluetoothDetailedView);
 };
 
 }  // namespace tray
 
-TrayBluetooth::TrayBluetooth()
-    : default_(NULL),
+TrayBluetooth::TrayBluetooth(SystemTray* system_tray)
+    : SystemTrayItem(system_tray),
+      default_(NULL),
       detailed_(NULL) {
 }
 
 TrayBluetooth::~TrayBluetooth() {
 }
 
 views::View* TrayBluetooth::CreateTrayView(user::LoginStatus status) {
   return NULL;
 }
 
 views::View* TrayBluetooth::CreateDefaultView(user::LoginStatus status) {
   CHECK(default_ == NULL);
   default_ = new tray::BluetoothDefaultView(this);
   return default_;
 }
 
 views::View* TrayBluetooth::CreateDetailedView(user::LoginStatus status) {
   if (!Shell::GetInstance()->tray_delegate()->GetBluetoothAvailable())
     return NULL;
   CHECK(detailed_ == NULL);
-  detailed_ = new tray::BluetoothDetailedView(status);
+  detailed_ = new tray::BluetoothDetailedView(this, status);
   return detailed_;
 }
 
 void TrayBluetooth::DestroyTrayView() {
 }
 
 void TrayBluetooth::DestroyDefaultView() {
   default_ = NULL;
 }
 
@@ skipping 16 matching lines @@
 void TrayBluetooth::OnBluetoothDiscoveringChanged() {
   if (!detailed_)
     return;
   BluetoothDeviceList list;
   Shell::GetInstance()->tray_delegate()->GetAvailableBluetoothDevices(&list);
   detailed_->Update(list);
 }
 
 }  // namespace internal
 }  // namespace ash