Move more from WmShell to Shell

ash/common/system/tray_accessibility.cc

 // Copyright (c) 2012 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/tray_accessibility.h"
 
 #include "ash/common/accessibility_delegate.h"
 #include "ash/common/accessibility_types.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/system/tray/hover_highlight_view.h"
@@ skipping 53 matching lines @@
   if (delegate->IsAutoclickEnabled())
     state |= A11Y_AUTOCLICK;
   if (delegate->IsVirtualKeyboardEnabled())
     state |= A11Y_VIRTUAL_KEYBOARD;
   if (delegate->IsBrailleDisplayConnected())
     state |= A11Y_BRAILLE_DISPLAY_CONNECTED;
   return state;
 }
 
 LoginStatus GetCurrentLoginStatus() {
-  return WmShell::Get()->system_tray_delegate()->GetUserLoginStatus();
+  return Shell::Get()->system_tray_delegate()->GetUserLoginStatus();
 }
 
 }  // namespace
 
 namespace tray {
 
 class DefaultAccessibilityView : public TrayItemMore {
  public:
   explicit DefaultAccessibilityView(SystemTrayItem* owner)
       : TrayItemMore(owner) {
@@ skipping 212 matching lines @@
 
   help_view_ = CreateHelpButton(login_);
   settings_view_ =
       CreateSettingsButton(login_, IDS_ASH_STATUS_TRAY_ACCESSIBILITY_SETTINGS);
   tri_view()->AddView(TriView::Container::END, help_view_);
   tri_view()->AddView(TriView::Container::END, settings_view_);
 }
 
 void AccessibilityDetailedView::ShowSettings() {
   if (TrayPopupUtils::CanOpenWebUISettings(login_)) {
-    WmShell::Get()->system_tray_controller()->ShowAccessibilitySettings();
+    Shell::Get()->system_tray_controller()->ShowAccessibilitySettings();
     owner()->system_tray()->CloseSystemBubble();
   }
 }
 
 void AccessibilityDetailedView::ShowHelp() {
   if (TrayPopupUtils::CanOpenWebUISettings(login_)) {
-    WmShell::Get()->system_tray_controller()->ShowAccessibilityHelp();
+    Shell::Get()->system_tray_controller()->ShowAccessibilityHelp();
     owner()->system_tray()->CloseSystemBubble();
   }
 }
 
 }  // namespace tray
 
 ////////////////////////////////////////////////////////////////////////////////
 // ash::TrayAccessibility
 
 TrayAccessibility::TrayAccessibility(SystemTray* system_tray)
@@ skipping 114 matching lines @@
     if (detailed_popup_)
       detailed_popup_->GetWidget()->Close();
     if (detailed_menu_)
       detailed_menu_->GetWidget()->Close();
   }
 
   previous_accessibility_state_ = accessibility_state;
 }
 
 }  // namespace ash