Moves couple of WmShell methods to standalone functions

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 388 matching lines @@
     base::RecordAction(UserMetricsAction("Accel_Fullscreen_F4"));
   accelerators::ToggleFullscreen();
 }
 
 void HandleToggleOverview() {
   base::RecordAction(base::UserMetricsAction("Accel_Overview_F5"));
   Shell::Get()->window_selector_controller()->ToggleOverview();
 }
 
 bool CanHandleWindowSnap() {
-  WmWindow* active_window = WmShell::Get()->GetActiveWindow();
+  WmWindow* active_window = WmWindow::Get(wm::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() &&
           !window_state->IsFullscreen());
 }
 
 void HandleWindowSnap(AcceleratorAction action) {
   if (action == WINDOW_CYCLE_SNAP_LEFT)
     base::RecordAction(UserMetricsAction("Accel_Window_Snap_Left"));
   else
     base::RecordAction(UserMetricsAction("Accel_Window_Snap_Right"));
 
   const wm::WMEvent event(action == WINDOW_CYCLE_SNAP_LEFT
                               ? wm::WM_EVENT_CYCLE_SNAP_LEFT
                               : wm::WM_EVENT_CYCLE_SNAP_RIGHT);
-  WmWindow* active_window = WmShell::Get()->GetActiveWindow();
+  WmWindow* active_window = WmWindow::Get(wm::GetActiveWindow());
   DCHECK(active_window);
   active_window->GetWindowState()->OnWMEvent(&event);
 }
 
 void HandleWindowMinimize() {
   base::RecordAction(base::UserMetricsAction("Accel_Toggle_Minimized_Minus"));
   accelerators::ToggleMinimized();
 }
 
 bool CanHandlePositionCenter() {
-  return WmShell::Get()->GetActiveWindow() != nullptr;
+  return wm::GetActiveWindow() != nullptr;
 }
 
 void HandlePositionCenter() {
   base::RecordAction(UserMetricsAction("Accel_Window_Position_Center"));
-  wm::CenterWindow(WmShell::Get()->GetActiveWindow());
+  wm::CenterWindow(WmWindow::Get(wm::GetActiveWindow()));
 }
 
 void HandleShowImeMenuBubble() {
   base::RecordAction(UserMetricsAction("Accel_Show_Ime_Menu_Bubble"));
 
   StatusAreaWidget* status_area_widget =
       WmShelf::ForWindow(WmShell::Get()->GetPrimaryRootWindow())
           ->GetStatusAreaWidget();
   if (status_area_widget) {
     ImeMenuTray* ime_menu_tray = status_area_widget->ime_menu_tray();
@@ skipping 842 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