Move 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 48 matching lines @@
   SetLayoutManager(box_layout);
 
   // Show the buttons in this row as disabled if the user is at the login
   // screen, lock screen, or in a secondary account flow. The exception is
   // |power_button_| which is always shown as enabled.
   const bool disable_buttons = !TrayPopupUtils::CanOpenWebUISettings(login_);
 
   settings_button_ = new SystemMenuButton(
       this, TrayPopupInkDropStyle::HOST_CENTERED, kSystemMenuSettingsIcon,
       IDS_ASH_STATUS_TRAY_SETTINGS);
-  if (disable_buttons || !shell->system_tray_delegate()->ShouldShowSettings())
+  if (disable_buttons ||
+      !Shell::Get()->system_tray_delegate()->ShouldShowSettings())
     settings_button_->SetEnabled(false);
   AddChildView(settings_button_);
   AddChildView(TrayPopupUtils::CreateVerticalSeparator());
 
   help_button_ =
       new SystemMenuButton(this, TrayPopupInkDropStyle::HOST_CENTERED,
                            kSystemMenuHelpIcon, IDS_ASH_STATUS_TRAY_HELP);
   if (base::i18n::IsRTL() &&
       base::i18n::GetConfiguredLocale() == kHebrewLocale) {
     // The asset for the help button is a question mark '?'. Normally this asset
@@ skipping 25 matching lines @@
   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);
-    shell->system_tray_controller()->ShowSettings();
+    Shell::Get()->system_tray_controller()->ShowSettings();
   } else if (sender == help_button_) {
     shell->RecordUserMetricsAction(UMA_TRAY_HELP);
-    shell->system_tray_controller()->ShowHelp();
+    Shell::Get()->system_tray_controller()->ShowHelp();
   } else if (sender == lock_button_) {
     shell->RecordUserMetricsAction(UMA_TRAY_LOCK_SCREEN);
     chromeos::DBusThreadManager::Get()
         ->GetSessionManagerClient()
         ->RequestLockScreen();
   } else if (sender == power_button_) {
     shell->RecordUserMetricsAction(UMA_TRAY_SHUT_DOWN);
     Shell::GetInstance()->lock_state_controller()->RequestShutdown();
   }
 
   owner_->system_tray()->CloseSystemBubble();
 }
 
 views::View* TilesDefaultView::GetHelpButtonView() const {
   return help_button_;
 }
 
 const views::CustomButton* TilesDefaultView::GetShutdownButtonViewForTest()
     const {
   return power_button_;
 }
 
 }  // namespace ash