chromeos: Move device shutdown handling out of chrome into ash

ash/common/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/common/system/date/date_default_view.h"
 
 #include "ash/common/metrics/user_metrics_action.h"
 #include "ash/common/session/session_state_delegate.h"
+#include "ash/common/shutdown_controller.h"
 #include "ash/common/system/date/date_view.h"
 #include "ash/common/system/tray/special_popup_row.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray/system_tray_controller.h"
-#include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_popup_header_button.h"
 #include "ash/common/wm_shell.h"
 #include "base/i18n/rtl.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/layout/fill_layout.h"
@@ skipping 13 matching lines @@
 const int kPaddingVertical = 19;
 
 }  // namespace
 
 namespace ash {
 
 DateDefaultView::DateDefaultView(SystemTrayItem* owner, LoginStatus login)
     : help_button_(nullptr),
       shutdown_button_(nullptr),
       lock_button_(nullptr),
-      date_view_(nullptr),
-      weak_factory_(this) {
+      date_view_(nullptr) {
   SetLayoutManager(new views::FillLayout);
 
   date_view_ = new tray::DateView(owner);
   date_view_->SetBorder(views::CreateEmptyBorder(
       kPaddingVertical, ash::kTrayPopupPaddingHorizontal, 0, 0));
   SpecialPopupRow* view = new SpecialPopupRow();
   view->SetContent(date_view_);
   AddChildView(view);
 
   WmShell* shell = WmShell::Get();
@@ skipping 24 matching lines @@
 
 #if !defined(OS_WIN)
   if (login != LoginStatus::LOCKED) {
     shutdown_button_ = new TrayPopupHeaderButton(
         this, IDR_AURA_UBER_TRAY_SHUTDOWN, IDR_AURA_UBER_TRAY_SHUTDOWN,
         IDR_AURA_UBER_TRAY_SHUTDOWN_HOVER, IDR_AURA_UBER_TRAY_SHUTDOWN_HOVER,
         IDS_ASH_STATUS_TRAY_SHUTDOWN);
     shutdown_button_->SetTooltipText(
         l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_SHUTDOWN));
     view->AddViewToRowNonMd(shutdown_button_, true);
+    // This object is recreated every time the menu opens. Don't bother updating
+    // the tooltip if the shutdown policy changes while the menu is open.
+    bool reboot = WmShell::Get()->shutdown_controller()->reboot_on_shutdown();
+    shutdown_button_->SetTooltipText(l10n_util::GetStringUTF16(
+        reboot ? IDS_ASH_STATUS_TRAY_REBOOT : IDS_ASH_STATUS_TRAY_SHUTDOWN));
   }
 
   if (shell->GetSessionStateDelegate()->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->AddViewToRowNonMd(lock_button_, true);
   }
-  SystemTrayDelegate* system_tray_delegate = shell->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 =
-      WmShell::Get()->system_tray_delegate();
-  if (system_tray_delegate)
-    system_tray_delegate->RemoveShutdownPolicyObserver(this);
-}
+DateDefaultView::~DateDefaultView() {}
 
 views::View* DateDefaultView::GetHelpButtonView() {
   return help_button_;
 }
 
 const views::View* DateDefaultView::GetShutdownButtonViewForTest() const {
   return shutdown_button_;
 }
 
 tray::DateView* DateDefaultView::GetDateView() {
@@ skipping 19 matching lines @@
     chromeos::DBusThreadManager::Get()
         ->GetSessionManagerClient()
         ->RequestLockScreen();
 #endif
   } else {
     NOTREACHED();
   }
   date_view_->CloseSystemBubble();
 }
 
-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