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

ash/system/chromeos/network/tray_network.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_network.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"
@@ skipping 61 matching lines @@
 
   MessageMap& messages() { return messages_; }
   const MessageMap& messages() const { return messages_; }
 
  private:
   MessageMap messages_;
 };
 
 class NetworkTrayView : public TrayItemView {
  public:
-  NetworkTrayView(ColorTheme size, bool tray_icon)
-      : color_theme_(size), tray_icon_(tray_icon) {
+  NetworkTrayView(SystemTrayItem* owner, ColorTheme size, bool tray_icon)
+      : TrayItemView(owner), color_theme_(size), tray_icon_(tray_icon) {
     SetLayoutManager(
         new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0));
 
     image_view_ = color_theme_ == DARK ?
         new FixedSizedImageView(0, kTrayPopupItemHeight) :
         new views::ImageView;
     AddChildView(image_view_);
 
     NetworkIconInfo info;
     Shell::GetInstance()->tray_delegate()->
@@ skipping 35 matching lines @@
     SetLabel(info.description);
     SetAccessibleName(info.description);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NetworkDefaultView);
 };
 
 class NetworkListDetailedView : public NetworkListDetailedViewBase {
  public:
-  NetworkListDetailedView(user::LoginStatus login, int header_string_id)
-      : NetworkListDetailedViewBase(login, header_string_id),
+  NetworkListDetailedView(SystemTrayItem* owner,
+                          user::LoginStatus login,
+                          int header_string_id)
+      : NetworkListDetailedViewBase(owner, login, header_string_id),
         airplane_(NULL),
         button_wifi_(NULL),
         button_mobile_(NULL),
         view_mobile_account_(NULL),
         setup_mobile_account_(NULL),
         other_wifi_(NULL),
         turn_on_wifi_(NULL),
         other_mobile_(NULL) {
   }
 
@@ skipping 203 matching lines @@
   views::View* setup_mobile_account_;
   TrayPopupLabelButton* other_wifi_;
   TrayPopupLabelButton* turn_on_wifi_;
   TrayPopupLabelButton* other_mobile_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkListDetailedView);
 };
 
 class NetworkWifiDetailedView : public NetworkDetailedView {
  public:
-  explicit NetworkWifiDetailedView(bool wifi_enabled) {
+  NetworkWifiDetailedView(SystemTrayItem* owner, bool wifi_enabled)
+     : NetworkDetailedView(owner) {

[msw, 2012/11/16 20:09:04]

nit: indent one more space.

[bartfab (slow), 2012/11/19 17:15:31]

Done.

     SetLayoutManager(new views::BoxLayout(views::BoxLayout::kHorizontal,
                                           kTrayPopupPaddingHorizontal,
                                           10,
                                           kTrayPopupPaddingBetweenItems));
     ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
     views::ImageView* image = new views::ImageView;
     const int image_id = wifi_enabled ?
         IDR_AURA_UBER_TRAY_WIFI_ENABLED : IDR_AURA_UBER_TRAY_WIFI_DISABLED;
     image->SetImage(bundle.GetImageNamed(image_id).ToImageSkia());
     AddChildView(image);
@@ skipping 21 matching lines @@
 
   virtual void Update() OVERRIDE {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NetworkWifiDetailedView);
 };
 
 class NetworkMessageView : public views::View,
                            public views::LinkListener {
  public:
-  NetworkMessageView(TrayNetwork* tray,
+  NetworkMessageView(TrayNetwork* owner,
                      TrayNetwork::MessageType message_type,
                      const NetworkMessages::Message& network_msg)
-      : tray_(tray),
+      : owner_(owner),
         message_type_(message_type) {
     SetLayoutManager(
         new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 1));
 
     if (!network_msg.title.empty()) {
       views::Label* title = new views::Label(network_msg.title);
       title->SetHorizontalAlignment(gfx::ALIGN_LEFT);
       title->SetFont(title->font().DeriveFont(0, gfx::Font::BOLD));
       AddChildView(title);
     }
@@ skipping 17 matching lines @@
         AddChildView(link);
       }
     }
   }
 
   virtual ~NetworkMessageView() {
   }
 
   // Overridden from views::LinkListener.
   virtual void LinkClicked(views::Link* source, int event_flags) OVERRIDE {
-    tray_->LinkClicked(message_type_, source->id());
+    owner_->LinkClicked(message_type_, source->id());
   }
 
   TrayNetwork::MessageType message_type() const { return message_type_; }
 
  private:
-  TrayNetwork* tray_;
+  TrayNetwork* owner_;
   TrayNetwork::MessageType message_type_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkMessageView);
 };
 
 class NetworkNotificationView : public TrayNotificationView {
  public:
-  explicit NetworkNotificationView(TrayNetwork* tray)
-      : TrayNotificationView(tray, 0) {
+  explicit NetworkNotificationView(TrayNetwork* owner)
+      : TrayNotificationView(owner, 0) {
     CreateMessageView();
     InitView(network_message_view_);
     SetIconImage(*ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
         GetMessageIcon(network_message_view_->message_type())));
   }
 
   // Overridden from TrayNotificationView.
   virtual void OnClose() OVERRIDE {
     tray_network()->ClearNetworkMessage(network_message_view_->message_type());
   }
 
   virtual void OnClickAction() OVERRIDE {
     if (network_message_view_->message_type() !=
         TrayNetwork::MESSAGE_DATA_PROMO)
-      tray()->PopupDetailedView(0, true);
+      owner()->PopupDetailedView(0, true);
   }
 
   void Update() {
     CreateMessageView();
     UpdateViewAndImage(network_message_view_,
         *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
             GetMessageIcon(network_message_view_->message_type())));
   }
 
  private:
   TrayNetwork* tray_network() {
-    return static_cast<TrayNetwork*>(tray());
+    return static_cast<TrayNetwork*>(owner());
   }
 
   void CreateMessageView() {
     // Display the first (highest priority) message.
     CHECK(!tray_network()->messages()->messages().empty());
     NetworkMessages::MessageMap::const_iterator iter =
         tray_network()->messages()->messages().begin();
     network_message_view_ =
         new NetworkMessageView(tray_network(), iter->first, iter->second);
   }
 
   tray::NetworkMessageView* network_message_view_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkNotificationView);
 };
 
 }  // namespace tray
 
-TrayNetwork::TrayNetwork()
-    : tray_(NULL),
+TrayNetwork::TrayNetwork(SystemTray* system_tray)
+    : SystemTrayItem(system_tray),
+      tray_(NULL),
       default_(NULL),
       detailed_(NULL),
       notification_(NULL),
       messages_(new tray::NetworkMessages()),
       request_wifi_view_(false) {
 }
 
 TrayNetwork::~TrayNetwork() {
 }
 
 views::View* TrayNetwork::CreateTrayView(user::LoginStatus status) {
   CHECK(tray_ == NULL);
-  tray_ = new tray::NetworkTrayView(tray::LIGHT, true /*tray_icon*/);
+  tray_ = new tray::NetworkTrayView(this, tray::LIGHT, true /*tray_icon*/);
   return tray_;
 }
 
 views::View* TrayNetwork::CreateDefaultView(user::LoginStatus status) {
   CHECK(default_ == NULL);
   default_ =
       new tray::NetworkDefaultView(this, status != user::LOGGED_IN_LOCKED);
   return default_;
 }
 
 views::View* TrayNetwork::CreateDetailedView(user::LoginStatus status) {
   CHECK(detailed_ == NULL);
   // Clear any notifications when showing the detailed view.
   messages_->messages().clear();
   HideNotificationView();
   if (request_wifi_view_) {
     SystemTrayDelegate* delegate = Shell::GetInstance()->tray_delegate();
     // The Wi-Fi state is not toggled yet at this point.
-    detailed_ = new tray::NetworkWifiDetailedView(!delegate->GetWifiEnabled());
+    detailed_ = new tray::NetworkWifiDetailedView(this,
+                                                  !delegate->GetWifiEnabled());
     request_wifi_view_ = false;
   } else {
     detailed_ = new tray::NetworkListDetailedView(
-        status, IDS_ASH_STATUS_TRAY_NETWORK);
+        this, status, IDS_ASH_STATUS_TRAY_NETWORK);
     detailed_->Init();
   }
   return detailed_;
 }
 
 views::View* TrayNetwork::CreateNotificationView(user::LoginStatus status) {
   CHECK(notification_ == NULL);
   if (messages_->messages().empty())
     return NULL;  // Message has already been cleared.
   notification_ = new tray::NetworkNotificationView(this);
@@ skipping 67 matching lines @@
 
 void TrayNetwork::LinkClicked(MessageType message_type, int link_id) {
   tray::NetworkMessages::MessageMap::const_iterator iter =
       messages()->messages().find(message_type);
   if (iter != messages()->messages().end() && iter->second.delegate)
     iter->second.delegate->NotificationLinkClicked(link_id);
 }
 
 }  // namespace internal
 }  // namespace ash