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

ash/system/tray/system_tray.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/system_tray.h"
 
 #include "ash/ash_switches.h"
 #include "ash/shell.h"
 #include "ash/shell/panel_window.h"
 #include "ash/shell_window_ids.h"
@@ skipping 111 matching lines @@
     (*it)->DestroyTrayView();
   }
 }
 
 void SystemTray::InitializeTrayItems(SystemTrayDelegate* delegate) {
   internal::TrayBackgroundView::Initialize();
   CreateItems(delegate);
 }
 
 void SystemTray::CreateItems(SystemTrayDelegate* delegate) {
-  internal::TrayVolume* tray_volume = new internal::TrayVolume();
-  internal::TrayBluetooth* tray_bluetooth = new internal::TrayBluetooth();
-  internal::TrayBrightness* tray_brightness = new internal::TrayBrightness();
-  internal::TrayDate* tray_date = new internal::TrayDate();
-  internal::TrayPower* tray_power = new internal::TrayPower();
-  internal::TrayIME* tray_ime = new internal::TrayIME();
-  internal::TrayUser* tray_user = new internal::TrayUser();
+  internal::TrayVolume* tray_volume = new internal::TrayVolume(this);
+  internal::TrayBluetooth* tray_bluetooth = new internal::TrayBluetooth(this);
+  internal::TrayBrightness* tray_brightness =
+      new internal::TrayBrightness(this);
+  internal::TrayDate* tray_date = new internal::TrayDate(this);
+  internal::TrayPower* tray_power = new internal::TrayPower(this);
+  internal::TrayIME* tray_ime = new internal::TrayIME(this);
+  internal::TrayUser* tray_user = new internal::TrayUser(this);
   internal::TrayAccessibility* tray_accessibility =
-      new internal::TrayAccessibility();
-  internal::TrayCapsLock* tray_caps_lock = new internal::TrayCapsLock();
-  internal::TrayDrive* tray_drive = new internal::TrayDrive();
-  internal::TrayLocale* tray_locale = new internal::TrayLocale();
+      new internal::TrayAccessibility(this);
+  internal::TrayCapsLock* tray_caps_lock = new internal::TrayCapsLock(this);
+  internal::TrayDrive* tray_drive = new internal::TrayDrive(this);
+  internal::TrayLocale* tray_locale = new internal::TrayLocale(this);
   internal::TrayLogoutButton* tray_logout_button =
-      new internal::TrayLogoutButton();
-  internal::TrayUpdate* tray_update = new internal::TrayUpdate();
-  internal::TraySettings* tray_settings = new internal::TraySettings();
+      new internal::TrayLogoutButton(this);
+  internal::TrayUpdate* tray_update = new internal::TrayUpdate(this);
+  internal::TraySettings* tray_settings = new internal::TraySettings(this);
 #if defined(OS_CHROMEOS)
-  internal::TrayDisplay* tray_display = new internal::TrayDisplay();
-  internal::TrayNetwork* tray_network = new internal::TrayNetwork();
-  internal::TrayVPN* tray_vpn = new internal::TrayVPN();
-  internal::TraySms* tray_sms = new internal::TraySms();
+  internal::TrayDisplay* tray_display = new internal::TrayDisplay(this);
+  internal::TrayNetwork* tray_network = new internal::TrayNetwork(this);
+  internal::TrayVPN* tray_vpn = new internal::TrayVPN(this);
+  internal::TraySms* tray_sms = new internal::TraySms(this);
 #endif
 
   SystemTrayNotifier* notifier = Shell::GetInstance()->system_tray_notifier();
   notifier->AddAccessibilityObserver(tray_accessibility);
   notifier->AddAudioObserver(tray_volume);
   notifier->AddBluetoothObserver(tray_bluetooth);
   notifier->AddBrightnessObserver(tray_brightness);
   notifier->AddCapsLockObserver(tray_caps_lock);
   notifier->AddClockObserver(tray_date);
   notifier->AddDriveObserver(tray_drive);
@@ skipping 30 matching lines @@
   AddTrayItem(tray_update);
   AddTrayItem(tray_accessibility);
   AddTrayItem(tray_caps_lock);
   AddTrayItem(tray_settings);
   AddTrayItem(tray_date);
 
 #if defined(OS_LINUX)
   // Add memory monitor if enabled.
   CommandLine* cmd = CommandLine::ForCurrentProcess();
   if (cmd->HasSwitch(ash::switches::kAshEnableMemoryMonitor))
-    AddTrayItem(new internal::TrayMonitor);
+    AddTrayItem(new internal::TrayMonitor(this));
 #endif
 
   SetVisible(ash::Shell::GetInstance()->tray_delegate()->
       GetTrayVisibilityOnStartup());
 }
 
 void SystemTray::AddTrayItem(SystemTrayItem* item) {
   items_.push_back(item);
 
   SystemTrayDelegate* delegate = Shell::GetInstance()->tray_delegate();
@@ skipping 367 matching lines @@
         ConvertPointToWidget(this, &point);
         arrow_offset = point.x();
       }
     }
     ShowDefaultViewWithOffset(BUBBLE_CREATE_NEW, arrow_offset);
   }
   return true;
 }
 
 }  // namespace ash