Moves AcceleratorController from Shell to WmShell

ash/common/wm_shell.h

Index: ash/common/wm_shell.h
diff --git a/ash/common/wm_shell.h b/ash/common/wm_shell.h
index 74a36292eeef2828187e1e6ee617b16fac89d225..28016113b8e0b20a84a0dce6476de25fe38dc3a7 100644
--- a/ash/common/wm_shell.h
+++ b/ash/common/wm_shell.h
@@ -22,6 +22,7 @@ class PointerDownWatcher;
 
 namespace ash {
 
+class AcceleratorController;
 class AccessibilityDelegate;
 class BrightnessControlDelegate;
 class DisplayInfo;
@@ -71,6 +72,10 @@ class ASH_EXPORT WmShell {
 
   ShellDelegate* delegate() { return delegate_.get(); }
 
+  AcceleratorController* accelerator_controller() {
+    return accelerator_controller_.get();
+  }
+
   AccessibilityDelegate* accessibility_delegate() {
     return accessibility_delegate_.get();
   }
@@ -289,6 +294,9 @@ class ASH_EXPORT WmShell {
 
   void DeleteToastManager();
 
+  void SetAcceleratorController(
+      std::unique_ptr<AcceleratorController> accelerator_controller);
+
  private:
   friend class AcceleratorControllerTest;
   friend class Shell;
@@ -298,6 +306,7 @@ class ASH_EXPORT WmShell {
   base::ObserverList<ShellObserver> shell_observers_;
   std::unique_ptr<ShellDelegate> delegate_;
 
+  std::unique_ptr<AcceleratorController> accelerator_controller_;
   std::unique_ptr<AccessibilityDelegate> accessibility_delegate_;
   std::unique_ptr<BrightnessControlDelegate> brightness_control_delegate_;
   std::unique_ptr<FocusCycler> focus_cycler_;