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

ash/system/chromeos/network/tray_sms.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_sms.h"
 
 #include "ash/ash_switches.h"
-#include "ash/shell.h"
 #include "ash/system/tray/system_tray.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_notification_view.h"
 #include "ash/system/tray/tray_views.h"
 #include "base/command_line.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
@@ skipping 25 matching lines @@
   return true;
 }
 
 }  // namespace
 
 namespace ash {
 namespace internal {
 
 class TraySms::SmsDefaultView : public TrayItemMore {
  public:
-  explicit SmsDefaultView(TraySms* tray)
-      : TrayItemMore(tray, true),
-        tray_(tray) {
+  explicit SmsDefaultView(TraySms* owner)
+      : TrayItemMore(owner, true) {
     SetImage(ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
         IDR_AURA_UBER_TRAY_SMS));
     Update();
   }
 
   virtual ~SmsDefaultView() {}
 
   void Update() {
-    int message_count = tray_->messages().GetSize();
+    int message_count = static_cast<TraySms*>(owner())->messages().GetSize();
     string16 label = l10n_util::GetStringFUTF16(
         IDS_ASH_STATUS_TRAY_SMS_MESSAGES, base::IntToString16(message_count));
     SetLabel(label);
     SetAccessibleName(label);
   }
 
  private:
-  TraySms* tray_;
-
   DISALLOW_COPY_AND_ASSIGN(SmsDefaultView);
 };
 
 // An entry (row) in SmsDetailedView or NotificationView.
 class TraySms::SmsMessageView : public views::View,
                                 public views::ButtonListener {
  public:
   enum ViewType {
     VIEW_DETAILED,
     VIEW_NOTIFICATION
   };
 
-  SmsMessageView(TraySms* tray,
+  SmsMessageView(TraySms* owner,
                  ViewType view_type,
                  size_t index,
                  const std::string& number,
                  const std::string& message)
-      : tray_(tray),
+      : owner_(owner),
         index_(index) {
     number_label_ = new views::Label(
         l10n_util::GetStringFUTF16(IDS_ASH_STATUS_TRAY_SMS_NUMBER,
                                    UTF8ToUTF16(number)));
     number_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     number_label_->SetFont(
         number_label_->font().DeriveFont(0, gfx::Font::BOLD));
 
     message_label_ = new views::Label(UTF8ToUTF16(message));
     message_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     message_label_->SetMultiLine(true);
 
     if (view_type == VIEW_DETAILED)
       LayoutDetailedView();
     else
       LayoutNotificationView();
   }
 
   virtual ~SmsMessageView() {
   }
 
   // Overridden from ButtonListener.
   virtual void ButtonPressed(views::Button* sender,
                              const ui::Event& event) OVERRIDE {
-    tray_->RemoveMessage(index_);
-    tray_->Update(false);
+    owner_->RemoveMessage(index_);
+    owner_->Update(false);
   }
 
  private:
   void LayoutDetailedView() {
     views::ImageButton* close_button = new views::ImageButton(this);
     close_button->SetImage(views::CustomButton::STATE_NORMAL,
         ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
             IDR_AURA_WINDOW_CLOSE));
 
     int msg_width = kTrayPopupWidth - kNotificationIconWidth -
@@ skipping 29 matching lines @@
   }
 
   void LayoutNotificationView() {
     SetLayoutManager(
         new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 1));
     AddChildView(number_label_);
     message_label_->SizeToFit(kTrayNotificationContentsWidth);
     AddChildView(message_label_);
   }
 
-  TraySms* tray_;
+  TraySms* owner_;
   size_t index_;
   views::Label* number_label_;
   views::Label* message_label_;
 
   DISALLOW_COPY_AND_ASSIGN(SmsMessageView);
 };
 
 class TraySms::SmsDetailedView : public TrayDetailsView,
                                  public ViewClickListener {
  public:
-  explicit SmsDetailedView(TraySms* tray)
-      : tray_(tray) {
+  explicit SmsDetailedView(TraySms* owner)
+      : TrayDetailsView(owner) {
     Init();
     Update();
   }
 
   virtual ~SmsDetailedView() {
   }
 
   void Init() {
     CreateScrollableList();
     CreateSpecialRow(IDS_ASH_STATUS_TRAY_SMS, this);
   }
 
   void Update() {
     UpdateMessageList();
     Layout();
     SchedulePaint();
   }
 
   // Overridden from views::View.
   gfx::Size GetPreferredSize() {
     gfx::Size preferred_size = TrayDetailsView::GetPreferredSize();
     if (preferred_size.height() < kMessageListMinHeight)
       preferred_size.set_height(kMessageListMinHeight);
     return preferred_size;
   }
 
  private:
   void UpdateMessageList() {
-    const base::ListValue& messages = tray_->messages();
+    const base::ListValue& messages =
+        static_cast<TraySms*>(owner())->messages();
     scroll_content()->RemoveAllChildViews(true);
     for (size_t index = 0; index < messages.GetSize(); ++index) {
       const base::DictionaryValue* message = NULL;
       if (!messages.GetDictionary(index, &message)) {
         LOG(ERROR) << "SMS message not a dictionary at: " << index;
         continue;
       }
       std::string number, text;
       if (!GetMessageFromDictionary(message, &number, &text)) {
         LOG(ERROR) << "Error parsing SMS message";
         continue;
       }
       SmsMessageView* msgview = new SmsMessageView(
-          tray_, SmsMessageView::VIEW_DETAILED, index, number, text);
+          static_cast<TraySms*>(owner()), SmsMessageView::VIEW_DETAILED, index,
+          number, text);
       scroll_content()->AddChildView(msgview);
     }
     scroller()->Layout();
   }
 
   // Overridden from ViewClickListener.
   virtual void ClickedOn(views::View* sender) OVERRIDE {
     if (sender == footer()->content())
-      Shell::GetInstance()->system_tray()->ShowDefaultView(BUBBLE_USE_EXISTING);
+      owner()->system_tray()->ShowDefaultView(BUBBLE_USE_EXISTING);
   }
 
-  TraySms* tray_;
-
   DISALLOW_COPY_AND_ASSIGN(SmsDetailedView);
 };
 
 class TraySms::SmsNotificationView : public TrayNotificationView {
  public:
-  SmsNotificationView(TraySms* tray,
+  SmsNotificationView(TraySms* owner,
                       size_t message_index,
                       const std::string& number,
                       const std::string& text)
-      : TrayNotificationView(tray, IDR_AURA_UBER_TRAY_SMS),
+      : TrayNotificationView(owner, IDR_AURA_UBER_TRAY_SMS),
         message_index_(message_index) {
     SmsMessageView* message_view = new SmsMessageView(
-        tray, SmsMessageView::VIEW_NOTIFICATION, message_index_, number, text);
+        owner, SmsMessageView::VIEW_NOTIFICATION, message_index_, number, text);
     InitView(message_view);
   }
 
   void Update(size_t message_index,
               const std::string& number,
               const std::string& text) {
     SmsMessageView* message_view = new SmsMessageView(
         tray_sms(), SmsMessageView::VIEW_NOTIFICATION,
         message_index_, number, text);
     UpdateView(message_view);
   }
 
   // Overridden from TrayNotificationView:
   virtual void OnClose() OVERRIDE {
     tray_sms()->RemoveMessage(message_index_);
   }
 
   virtual void OnClickAction() OVERRIDE {
-    tray()->PopupDetailedView(0, true);
+    owner()->PopupDetailedView(0, true);
   }
 
  private:
   TraySms* tray_sms() {
-    return static_cast<TraySms*>(tray());
+    return static_cast<TraySms*>(owner());
   }
 
   size_t message_index_;
 
   DISALLOW_COPY_AND_ASSIGN(SmsNotificationView);
 };
 
-TraySms::TraySms()
-    : default_(NULL),
+TraySms::TraySms(SystemTray* system_tray)
+    : SystemTrayItem(system_tray),
+      default_(NULL),
       detailed_(NULL),
       notification_(NULL) {
 }
 
 TraySms::~TraySms() {
 }
 
 views::View* TraySms::CreateDefaultView(user::LoginStatus status) {
   CHECK(default_ == NULL);
   default_ = new SmsDefaultView(this);
@@ skipping 76 matching lines @@
       if (GetLatestMessage(&index, &number, &text))
         notification_->Update(index, number, text);
     } else if (notify) {
       ShowNotificationView();
     }
   }
 }
 
 }  // namespace internal
 }  // namespace ash