chromeos: Simplify ShutdownPolicyHandler

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/system/date/date_view.h"
 #include "ash/common/system/tray/special_popup_row.h"
@@ skipping 85 matching lines @@
     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()));
+  // Will invoke OnShutdownPolicyChanged with the initial value.
+  system_tray_delegate->CheckIfRebootOnShutdown();
 #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);
 }
@@ skipping 39 matching lines @@
 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