Move AcceleratorController from WmShell to Shell

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 2aaf72a94033ffcc7155889838c067501fc6c8f9..b15e91af943efe5ec352d0e0cce831eff36f52e9 100644
--- a/ash/common/wm_shell.h
+++ b/ash/common/wm_shell.h
@@ -92,10 +92,6 @@ class ASH_EXPORT WmShell : public SessionStateObserver {
 
   virtual void Shutdown();
 
-  AcceleratorController* accelerator_controller() {
-    return accelerator_controller_.get();
-  }
-
   BrightnessControlDelegate* brightness_control_delegate() {
     return brightness_control_delegate_.get();
   }
@@ -333,6 +329,10 @@ class ASH_EXPORT WmShell : public SessionStateObserver {
   virtual void CreatePrimaryHost() = 0;
   virtual void InitHosts(const ShellInitParams& init_params) = 0;
 
+  // Called during startup to create the AcceleratorController.

[James Cook, 2017/03/17 18:01:46]

Thanks for documenting when it is expected to be called.

+  virtual std::unique_ptr<AcceleratorController>
+  CreateAcceleratorController() = 0;
+
   void SetKeyboardUI(std::unique_ptr<KeyboardUI> keyboard_ui);
 
   // Helpers to set (and initialize) or destroy various delegates.
@@ -350,9 +350,6 @@ class ASH_EXPORT WmShell : public SessionStateObserver {
   void CreateMruWindowTracker();
   void DeleteMruWindowTracker();
 
-  void SetAcceleratorController(
-      std::unique_ptr<AcceleratorController> accelerator_controller);
-
   // SessionStateObserver:
   void SessionStateChanged(session_manager::SessionState state) override;
 
@@ -363,7 +360,6 @@ class ASH_EXPORT WmShell : public SessionStateObserver {
 
   static WmShell* instance_;
 
-  std::unique_ptr<AcceleratorController> accelerator_controller_;
   std::unique_ptr<BrightnessControlDelegate> brightness_control_delegate_;
   std::unique_ptr<CastConfigController> cast_config_;
   std::unique_ptr<FocusCycler> focus_cycler_;