Move AcceleratorController from WmShell to Shell

ash/common/accelerators/accelerator_router.cc

 // Copyright 2014 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_router.h"
 
 #include "ash/common/accelerators/accelerator_controller.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
@@ skipping 39 matching lines @@
   DCHECK(target);
   RecordSearchKeyStats(accelerator);
   // Special hardware keys like brightness and volume are handled in
   // special way. However, some windows can override this behavior
   // (e.g. Chrome v1 apps by default and Chrome v2 apps with
   // permission) by setting a window property.
   if (IsSystemKey(key_event.key_code()) &&
       !CanConsumeSystemKeys(target, key_event)) {
     // System keys are always consumed regardless of whether they trigger an
     // accelerator to prevent windows from seeing unexpected key up events.
-    WmShell::Get()->accelerator_controller()->Process(accelerator);
+    Shell::Get()->accelerator_controller()->Process(accelerator);
     return true;
   }
   if (!ShouldProcessAcceleratorNow(target, key_event, accelerator))
     return false;
-  return WmShell::Get()->accelerator_controller()->Process(accelerator);
+  return Shell::Get()->accelerator_controller()->Process(accelerator);
 }
 
 void AcceleratorRouter::RecordSearchKeyStats(
     const ui::Accelerator& accelerator) {
   if (accelerator.IsCmdDown()) {
     if (search_key_state_ == RELEASED) {
       search_key_state_ = PRESSED;
       search_key_pressed_timestamp_ = base::TimeTicks::Now();
     }
 
@@ skipping 25 matching lines @@
   DCHECK(target);
   // On ChromeOS, If the accelerator is Search+<key(s)> then it must never be
   // intercepted by apps or windows.
   if (accelerator.IsCmdDown())
     return true;
 
   if (base::ContainsValue(WmShell::Get()->GetAllRootWindows(), target))
     return true;
 
   AcceleratorController* accelerator_controller =
-      WmShell::Get()->accelerator_controller();
+      Shell::Get()->accelerator_controller();
 
   // Reserved accelerators (such as Power button) always have a prority.
   if (accelerator_controller->IsReserved(accelerator))
     return true;
 
   // A full screen window has a right to handle all key events including the
   // reserved ones.
   WmWindow* top_level = target->GetToplevelWindowForFocus();
   if (top_level && top_level->GetWindowState()->IsFullscreen()) {
     // On ChromeOS, fullscreen windows are either browser or apps, which
     // send key events to a web content first, then will process keys
     // if the web content didn't consume them.
     return false;
   }
 
   // Handle preferred accelerators (such as ALT-TAB) before sending
   // to the target.
   if (accelerator_controller->IsPreferred(accelerator))
     return true;
 
   return Shell::Get()->GetAppListTargetVisibility();
 }
 
 }  // namespace ash