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

ash/system/chromeos/network/tray_vpn.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/chromeos/network/tray_vpn.h"
 
 #include "ash/shell.h"
 #include "ash/system/chromeos/network/network_list_detailed_view_base.h"
+#include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_item_more.h"
 #include "grit/ash_strings.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace ash {
 namespace internal {
 
 namespace tray {
 
 class VpnDefaultView : public TrayItemMore {
  public:
-  VpnDefaultView(SystemTrayItem* owner, bool show_more)
-      : TrayItemMore(owner, show_more) {
+  VpnDefaultView(SystemTrayItem* tray, bool show_more)
+      : TrayItemMore(tray, show_more) {
     Update();
   }
 
   virtual ~VpnDefaultView() {}
 
   void Update() {
     NetworkIconInfo info;
     Shell::GetInstance()->tray_delegate()->GetVirtualNetworkIcon(&info);
     SetImage(&info.image);
     SetLabel(info.description);
     SetAccessibleName(info.description);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(VpnDefaultView);
 };
 
 class VpnListDetailedView : public NetworkListDetailedViewBase {
  public:
-  VpnListDetailedView(user::LoginStatus login, int header_string_id)
-      : NetworkListDetailedViewBase(login, header_string_id),
+  VpnListDetailedView(SystemTrayItem* tray,
+                      user::LoginStatus login,
+                      int header_string_id)
+      : NetworkListDetailedViewBase(tray, login, header_string_id),
         other_vpn_(NULL) {
   }
   virtual ~VpnListDetailedView() {
   }
 
   // Overridden from NetworkListDetailedViewBase:
 
   virtual void AppendHeaderButtons() OVERRIDE {
     AppendInfoButtonToHeader();
   }
@@ skipping 54 matching lines @@
   }
 
  private:
   TrayPopupLabelButton* other_vpn_;
 
   DISALLOW_COPY_AND_ASSIGN(VpnListDetailedView);
 };
 
 }  // namespace tray
 
-TrayVPN::TrayVPN()
-    : default_(NULL),
+TrayVPN::TrayVPN(SystemTray* system_tray)
+    : SystemTrayItem(system_tray),
+      default_(NULL),
       detailed_(NULL) {
 }
 
 TrayVPN::~TrayVPN() {
 }
 
 views::View* TrayVPN::CreateTrayView(user::LoginStatus status) {
   return NULL;
 }
 
 views::View* TrayVPN::CreateDefaultView(user::LoginStatus status) {
   CHECK(default_ == NULL);
   if (status == user::LOGGED_IN_NONE)
     return NULL;
 
   // Do not show VPN line in uber tray bubble if VPN is not configured.
   std::vector<NetworkIconInfo> list;
   Shell::GetInstance()->tray_delegate()->GetVirtualNetworks(&list);
   if (list.size() == 0)
     return NULL;
 
   default_ = new tray::VpnDefaultView(this, status != user::LOGGED_IN_LOCKED);
   return default_;
 }
 
 views::View* TrayVPN::CreateDetailedView(user::LoginStatus status) {
   CHECK(detailed_ == NULL);
-  detailed_ = new tray::VpnListDetailedView(status, IDS_ASH_STATUS_TRAY_VPN);
+  detailed_ = new tray::VpnListDetailedView(
+      this, status, IDS_ASH_STATUS_TRAY_VPN);
   detailed_->Init();
   return detailed_;
 }
 
 views::View* TrayVPN::CreateNotificationView(user::LoginStatus status) {
   return NULL;
 }
 
 void TrayVPN::DestroyTrayView() {
 }
@@ skipping 30 matching lines @@
 }
 
 void TrayVPN::ClearNetworkMessage(MessageType message_type) {
 }
 
 void TrayVPN::OnWillToggleWifi() {
 }
 
 }  // namespace internal
 }  // namespace ash