Move AcceleratorController from WmShell to Shell

ash/aura/wm_shell_aura.h

 // Copyright 2016 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.
 
 #ifndef ASH_AURA_WM_SHELL_AURA_H_
 #define ASH_AURA_WM_SHELL_AURA_H_
 
 #include <memory>
 
 #include "ash/ash_export.h"
 #include "ash/common/wm_shell.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
 
 namespace ash {
 
+class AcceleratorControllerDelegateAura;
 class PointerWatcherAdapter;
 
 class ASH_EXPORT WmShellAura : public WmShell,
                                public WindowTreeHostManager::Observer {
  public:
   WmShellAura();
   ~WmShellAura() override;
 
   static WmShellAura* Get();
 
+  AcceleratorControllerDelegateAura* accelerator_controller_delegate() {
+    return accelerator_controller_delegate_.get();
+  }
 
   // WmShell:
   void Shutdown() override;
   bool IsRunningInMash() const override;
   WmWindow* GetFocusedWindow() override;
   WmWindow* GetActiveWindow() override;
   WmWindow* GetCaptureWindow() override;
   WmWindow* GetPrimaryRootWindow() override;
   WmWindow* GetRootWindowForDisplayId(int64_t display_id) override;
   const display::ManagedDisplayInfo& GetDisplayInfo(
@@ skipping 33 matching lines @@
   void AddPointerWatcher(views::PointerWatcher* watcher,
                          views::PointerWatcherEventTypes events) override;
   void RemovePointerWatcher(views::PointerWatcher* watcher) override;
   bool IsTouchDown() override;
   void ToggleIgnoreExternalKeyboard() override;
   void SetLaserPointerEnabled(bool enabled) override;
   void SetPartialMagnifierEnabled(bool enabled) override;
   void CreatePointerWatcherAdapter() override;
   void CreatePrimaryHost() override;
   void InitHosts(const ShellInitParams& init_params) override;
+  std::unique_ptr<AcceleratorController> CreateAcceleratorController() override;
 
  private:
   // SessionStateObserver:
   void SessionStateChanged(session_manager::SessionState state) override;
 
   // WindowTreeHostManager::Observer:
   void OnDisplayConfigurationChanging() override;
   void OnDisplayConfigurationChanged() override;
 
   std::unique_ptr<PointerWatcherAdapter> pointer_watcher_adapter_;
 
   bool added_display_observer_ = false;
   base::ObserverList<WmDisplayObserver> display_observers_;
 
+  std::unique_ptr<AcceleratorControllerDelegateAura>
+      accelerator_controller_delegate_;
+
   DISALLOW_COPY_AND_ASSIGN(WmShellAura);
 };
 
 }  // namespace ash
 
 #endif  // ASH_AURA_WM_SHELL_AURA_H_