chromeos: Simplify ShutdownPolicyHandler

ash/common/system/tiles/tiles_default_view.cc

 // Copyright 2016 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/tiles/tiles_default_view.h"
 
 #include "ash/common/metrics/user_metrics_action.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/system/tray/system_menu_button.h"
 #include "ash/common/system/tray/system_tray.h"
@@ skipping 93 matching lines @@
 
   AddChildView(lock_button_);
   AddChildView(TrayPopupUtils::CreateVerticalSeparator());
 
   power_button_ =
       new SystemMenuButton(this, SystemMenuButton::InkDropStyle::FLOOD_FILL,
                            kSystemMenuPowerIcon, IDS_ASH_STATUS_TRAY_SHUTDOWN);
   AddChildView(power_button_);
   SystemTrayDelegate* system_tray_delegate = shell->system_tray_delegate();
   system_tray_delegate->AddShutdownPolicyObserver(this);
-  system_tray_delegate->ShouldRebootOnShutdown(base::Bind(
-      &TilesDefaultView::OnShutdownPolicyChanged, weak_factory_.GetWeakPtr()));
+  // Will invoke OnShutdownPolicyChanged with the initial value.
+  system_tray_delegate->CheckIfRebootOnShutdown();
 #endif  // !defined(OS_WIN)

[James Cook, 2016/11/10 23:33:54]

FYI - The above code is forked/copied because it's the new material design
system tray menu. Material design is on by default in M56, so the other file
will be deleted soon. I didn't fork it. :-)

 }
 
 void TilesDefaultView::ButtonPressed(views::Button* sender,
                                      const ui::Event& event) {
   DCHECK(sender);
   WmShell* shell = WmShell::Get();
   if (sender == settings_button_) {
     shell->RecordUserMetricsAction(UMA_TRAY_SETTINGS);
     shell->system_tray_controller()->ShowSettings();
   } else if (sender == help_button_) {
@@ skipping 26 matching lines @@
 views::View* TilesDefaultView::GetHelpButtonView() const {
   return help_button_;
 }
 
 const views::CustomButton* TilesDefaultView::GetShutdownButtonViewForTest()
     const {
   return power_button_;
 }
 
 }  // namespace ash