Promotes more accessors from WmShell to Shell

ash/common/accelerators/accelerator_controller.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/accelerators/accelerator_controller.h"
 
 #include <utility>
 
 #include "ash/common/accelerators/accelerator_commands.h"
 #include "ash/common/accelerators/accelerator_controller_delegate.h"
@@ skipping 157 matching lines @@
   auto* histogram = base::LinearHistogram::FactoryGet(
       histogram_name, 1, DEPRECATED_USAGE_COUNT, DEPRECATED_USAGE_COUNT + 1,
       base::HistogramBase::kUmaTargetedHistogramFlag);
   histogram->Add(sample);
 }
 
 void HandleCycleBackwardMRU(const ui::Accelerator& accelerator) {
   if (accelerator.key_code() == ui::VKEY_TAB)
     base::RecordAction(base::UserMetricsAction("Accel_PrevWindow_Tab"));
 
-  WmShell::Get()->window_cycle_controller()->HandleCycleWindow(
+  Shell::Get()->window_cycle_controller()->HandleCycleWindow(
       WindowCycleController::BACKWARD);
 }
 
 void HandleCycleForwardMRU(const ui::Accelerator& accelerator) {
   if (accelerator.key_code() == ui::VKEY_TAB)
     base::RecordAction(base::UserMetricsAction("Accel_NextWindow_Tab"));
 
-  WmShell::Get()->window_cycle_controller()->HandleCycleWindow(
+  Shell::Get()->window_cycle_controller()->HandleCycleWindow(
       WindowCycleController::FORWARD);
 }
 
 void HandleRotatePaneFocus(FocusCycler::Direction direction) {
   switch (direction) {
     // TODO(stevet): Not sure if this is the same as IDC_FOCUS_NEXT_PANE.
     case FocusCycler::FORWARD: {
       base::RecordAction(UserMetricsAction("Accel_Focus_Next_Pane"));
       break;
     }
@@ skipping 197 matching lines @@
 }
 
 void HandleToggleFullscreen(const ui::Accelerator& accelerator) {
   if (accelerator.key_code() == ui::VKEY_MEDIA_LAUNCH_APP2)
     base::RecordAction(UserMetricsAction("Accel_Fullscreen_F4"));
   accelerators::ToggleFullscreen();
 }
 
 void HandleToggleOverview() {
   base::RecordAction(base::UserMetricsAction("Accel_Overview_F5"));
-  WmShell::Get()->window_selector_controller()->ToggleOverview();
+  Shell::Get()->window_selector_controller()->ToggleOverview();
 }
 
 bool CanHandleWindowSnap() {
   WmWindow* active_window = WmShell::Get()->GetActiveWindow();
   if (!active_window)
     return false;
   wm::WindowState* window_state = active_window->GetWindowState();
   // Disable window snapping shortcut key for full screen window due to
   // http://crbug.com/135487.
   return (window_state && window_state->IsUserPositionable() &&
@@ skipping 759 matching lines @@
     case TOGGLE_MAXIMIZED:
       accelerators::ToggleMaximized();
       break;
     case TOGGLE_OVERVIEW:
       HandleToggleOverview();
       break;
     case TOGGLE_SPOKEN_FEEDBACK:
       HandleToggleSpokenFeedback();
       break;
     case TOGGLE_WIFI:
-      WmShell::Get()->system_tray_notifier()->NotifyRequestToggleWifi();
+      Shell::Get()->system_tray_notifier()->NotifyRequestToggleWifi();
       break;
     case VOLUME_DOWN:
       HandleVolumeDown(volume_controller_.get(), accelerator);
       break;
     case VOLUME_MUTE:
       HandleVolumeMute(volume_controller_.get(), accelerator);
       break;
     case VOLUME_UP:
       HandleVolumeUp(volume_controller_.get(), accelerator);
       break;
@@ skipping 95 matching lines @@
       data->uma_histogram_name, data->notification_message_id,
       data->old_shortcut_id, data->new_shortcut_id);
 
   if (!data->deprecated_enabled)
     return AcceleratorProcessingStatus::STOP;
 
   return AcceleratorProcessingStatus::PROCEED;
 }
 
 }  // namespace ash