mash: Move SystemTrayDelegate ownership to WmShell

ash/system/date/date_default_view.cc

 // Copyright 2014 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/date/date_default_view.h"
 
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/tray_constants.h"
+#include "ash/common/wm_shell.h"
 #include "ash/metrics/user_metrics_recorder.h"
 #include "ash/shell.h"
 #include "ash/system/date/date_view.h"
 #include "ash/system/tray/special_popup_row.h"
 #include "ash/system/tray/tray_popup_header_button.h"
 #include "ash/wm/lock_state_controller.h"
 #include "base/i18n/rtl.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 68 matching lines @@
   if (ash::Shell::GetInstance()->session_state_delegate()->CanLockScreen()) {
     lock_button_ = new TrayPopupHeaderButton(
         this, IDR_AURA_UBER_TRAY_LOCKSCREEN, IDR_AURA_UBER_TRAY_LOCKSCREEN,
         IDR_AURA_UBER_TRAY_LOCKSCREEN_HOVER,
         IDR_AURA_UBER_TRAY_LOCKSCREEN_HOVER, IDS_ASH_STATUS_TRAY_LOCK);
     lock_button_->SetTooltipText(
         l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_LOCK));
     view->AddButton(lock_button_);
   }
   SystemTrayDelegate* system_tray_delegate =
-      Shell::GetInstance()->system_tray_delegate();
+      WmShell::Get()->system_tray_delegate();
   system_tray_delegate->AddShutdownPolicyObserver(this);
   system_tray_delegate->ShouldRebootOnShutdown(base::Bind(
       &DateDefaultView::OnShutdownPolicyChanged, weak_factory_.GetWeakPtr()));
 #endif  // !defined(OS_WIN)
 }
 
 DateDefaultView::~DateDefaultView() {
   // We need the check as on shell destruction, the delegate is destroyed first.
   SystemTrayDelegate* system_tray_delegate =
-      Shell::GetInstance()->system_tray_delegate();
+      WmShell::Get()->system_tray_delegate();
   if (system_tray_delegate)
     system_tray_delegate->RemoveShutdownPolicyObserver(this);
 }
 
 views::View* DateDefaultView::GetHelpButtonView() {
   return help_button_;
 }
 
 const views::View* DateDefaultView::GetShutdownButtonViewForTest() const {
   return shutdown_button_;
 }
 
 tray::DateView* DateDefaultView::GetDateView() {
   return date_view_;
 }
 
 const tray::DateView* DateDefaultView::GetDateView() const {
   return date_view_;
 }
 
 void DateDefaultView::ButtonPressed(views::Button* sender,
                                     const ui::Event& event) {
-  ash::Shell* shell = ash::Shell::GetInstance();
-  ash::SystemTrayDelegate* tray_delegate = shell->system_tray_delegate();
+  Shell* shell = Shell::GetInstance();
+  SystemTrayDelegate* tray_delegate = WmShell::Get()->system_tray_delegate();
   if (sender == help_button_) {
     shell->metrics()->RecordUserMetricsAction(ash::UMA_TRAY_HELP);
     tray_delegate->ShowHelp();
   } else if (sender == shutdown_button_) {
     shell->metrics()->RecordUserMetricsAction(ash::UMA_TRAY_SHUT_DOWN);
-    ash::Shell::GetInstance()->lock_state_controller()->RequestShutdown();
+    shell->lock_state_controller()->RequestShutdown();
   } else if (sender == lock_button_) {
     shell->metrics()->RecordUserMetricsAction(ash::UMA_TRAY_LOCK_SCREEN);
     tray_delegate->RequestLockScreen();
   } else {
     NOTREACHED();
   }
 }
 
 void DateDefaultView::OnShutdownPolicyChanged(bool reboot_on_shutdown) {
   if (!shutdown_button_)
     return;
 
   shutdown_button_->SetTooltipText(l10n_util::GetStringUTF16(
       reboot_on_shutdown ? IDS_ASH_STATUS_TRAY_REBOOT
                          : IDS_ASH_STATUS_TRAY_SHUTDOWN));
 }
 
 }  // namespace ash