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

ash/system/ime/tray_ime.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/ime/tray_ime.h"
 
 #include <vector>
 
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
@@ skipping 46 matching lines @@
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(IMEDefaultView);
 };
 
 class IMEDetailedView : public TrayDetailsView,
                         public ViewClickListener {
  public:
   IMEDetailedView(SystemTrayItem* owner, user::LoginStatus login)
-      : login_(login) {
+      : TrayDetailsView(owner),
+        login_(login) {
     SystemTrayDelegate* delegate = Shell::GetInstance()->tray_delegate();
     IMEInfoList list;
     delegate->GetAvailableIMEList(&list);
     IMEPropertyInfoList property_list;
     delegate->GetCurrentIMEProperties(&property_list);
     Update(list, property_list);
   }
 
   virtual ~IMEDetailedView() {}
 
@@ skipping 53 matching lines @@
         GetLocalizedString(IDS_ASH_STATUS_TRAY_IME_SETTINGS),
         gfx::Font::NORMAL);
     AddChildView(container);
     settings_ = container;
   }
 
   // Overridden from ViewClickListener.
   virtual void ClickedOn(views::View* sender) OVERRIDE {
     SystemTrayDelegate* delegate = Shell::GetInstance()->tray_delegate();
     if (sender == footer()->content()) {
-      Shell::GetInstance()->system_tray()->ShowDefaultView(BUBBLE_USE_EXISTING);
+      owner()->system_tray()->ShowDefaultView(BUBBLE_USE_EXISTING);
     } else if (sender == settings_) {
       delegate->ShowIMESettings();
     } else {
       std::map<views::View*, std::string>::const_iterator ime_find;
       ime_find = ime_map_.find(sender);
       if (ime_find != ime_map_.end()) {
         std::string ime_id = ime_find->second;
         delegate->SwitchIME(ime_id);
         GetWidget()->Close();
       } else {
@@ skipping 12 matching lines @@
 
   std::map<views::View*, std::string> ime_map_;
   std::map<views::View*, std::string> property_map_;
   views::View* settings_;
 
   DISALLOW_COPY_AND_ASSIGN(IMEDetailedView);
 };
 
 class IMENotificationView : public TrayNotificationView {
  public:
-  explicit IMENotificationView(TrayIME* tray)
-      : TrayNotificationView(tray, IDR_AURA_UBER_TRAY_IME) {
+  explicit IMENotificationView(TrayIME* owner)
+      : TrayNotificationView(owner, IDR_AURA_UBER_TRAY_IME) {
     InitView(GetLabel());
   }
 
   void UpdateLabel() {
     RestartAutoCloseTimer();
     UpdateView(GetLabel());
   }
 
   void StartAutoCloseTimer(int seconds) {
     autoclose_.Stop();
     autoclose_delay_ = seconds;
     if (autoclose_delay_) {
       autoclose_.Start(FROM_HERE,
                        base::TimeDelta::FromSeconds(autoclose_delay_),
                        this, &IMENotificationView::Close);
     }
   }
 
   void StopAutoCloseTimer() {
     autoclose_.Stop();
   }
 
   void RestartAutoCloseTimer() {
     if (autoclose_delay_)
       StartAutoCloseTimer(autoclose_delay_);
   }
 
   // Overridden from TrayNotificationView.
   virtual void OnClickAction() OVERRIDE {
-    tray()->PopupDetailedView(0, true);
+    owner()->PopupDetailedView(0, true);
   }
 
  private:
   void Close() {
-    tray()->HideNotificationView();
+    owner()->HideNotificationView();
   }
 
   views::Label* GetLabel() {
     SystemTrayDelegate* delegate = Shell::GetInstance()->tray_delegate();
     IMEInfo current;
     delegate->GetCurrentIME(&current);
 
     // TODO(zork): Use IDS_ASH_STATUS_TRAY_THIRD_PARTY_IME_TURNED_ON_BUBBLE for
     // third party IMEs
     views::Label* label = new views::Label(
         l10n_util::GetStringFUTF16(
             IDS_ASH_STATUS_TRAY_IME_TURNED_ON_BUBBLE,
             current.medium_name));
     label->SetMultiLine(true);
     label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     return label;
   }
 
 
   int autoclose_delay_;
   base::OneShotTimer<IMENotificationView> autoclose_;
 
   DISALLOW_COPY_AND_ASSIGN(IMENotificationView);
 };
 
 
 }  // namespace tray
 
-TrayIME::TrayIME()
-    : tray_label_(NULL),
+TrayIME::TrayIME(SystemTray* system_tray)
+    : SystemTrayItem(system_tray),
+      tray_label_(NULL),
       default_(NULL),
       detailed_(NULL),
       notification_(NULL),
       message_shown_(false) {
 }
 
 TrayIME::~TrayIME() {
 }
 
 void TrayIME::UpdateTrayLabel(const IMEInfo& current, size_t count) {
   if (tray_label_) {
     if (current.third_party) {
       tray_label_->label()->SetText(current.short_name + UTF8ToUTF16("*"));
     } else {
       tray_label_->label()->SetText(current.short_name);
     }
     tray_label_->SetVisible(count > 1);
-    SetTrayLabelItemBorder(tray_label_,
-        ash::Shell::GetInstance()->system_tray()->shelf_alignment());
+    SetTrayLabelItemBorder(tray_label_, system_tray()->shelf_alignment());
     tray_label_->Layout();
   }
 }
 
 views::View* TrayIME::CreateTrayView(user::LoginStatus status) {
   CHECK(tray_label_ == NULL);
-  tray_label_ = new TrayItemView;
+  tray_label_ = new TrayItemView(this);
   tray_label_->CreateLabel();
   SetupLabelForTray(tray_label_->label());
   return tray_label_;
 }
 
 views::View* TrayIME::CreateDefaultView(user::LoginStatus status) {
   SystemTrayDelegate* delegate = Shell::GetInstance()->tray_delegate();
   IMEInfoList list;
   IMEPropertyInfoList property_list;
   delegate->GetAvailableIMEList(&list);
@@ skipping 65 matching lines @@
     } else if (!Shell::GetPrimaryRootWindowController()->shelf()->IsVisible() ||
                !message_shown_) {
       ShowNotificationView();
       message_shown_ = true;
     }
   }
 }
 
 }  // namespace internal
 }  // namespace ash