Move yet more from WmShell to Shell

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_controller.h"
 #include "ash/common/shutdown_controller.h"
 #include "ash/common/system/tray/system_menu_button.h"
@@ skipping 72 matching lines @@
     help_button_->EnableCanvasFlippingForRTLUI(false);
   }
   if (disable_buttons)
     help_button_->SetEnabled(false);
   AddChildView(help_button_);
   AddChildView(TrayPopupUtils::CreateVerticalSeparator());
 
   lock_button_ =
       new SystemMenuButton(this, TrayPopupInkDropStyle::HOST_CENTERED,
                            kSystemMenuLockIcon, IDS_ASH_STATUS_TRAY_LOCK);
-  if (disable_buttons || !shell->session_controller()->CanLockScreen())
+  if (disable_buttons || !Shell::Get()->session_controller()->CanLockScreen())
     lock_button_->SetEnabled(false);
 
   AddChildView(lock_button_);
   AddChildView(TrayPopupUtils::CreateVerticalSeparator());
 
   power_button_ =
       new SystemMenuButton(this, TrayPopupInkDropStyle::HOST_CENTERED,
                            kSystemMenuPowerIcon, IDS_ASH_STATUS_TRAY_SHUTDOWN);
   AddChildView(power_button_);
   // 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();
+  bool reboot = shell->shutdown_controller()->reboot_on_shutdown();
   power_button_->SetTooltipText(l10n_util::GetStringUTF16(
       reboot ? IDS_ASH_STATUS_TRAY_REBOOT : IDS_ASH_STATUS_TRAY_SHUTDOWN));
 }
 
 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);
@@ skipping 17 matching lines @@
 views::View* TilesDefaultView::GetHelpButtonView() const {
   return help_button_;
 }
 
 const views::CustomButton* TilesDefaultView::GetShutdownButtonViewForTest()
     const {
   return power_button_;
 }
 
 }  // namespace ash