Moves AcceleratorController from Shell to WmShell

ash/common/wm_shell.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_COMMON_WM_SHELL_H_
 #define ASH_COMMON_WM_SHELL_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <vector>
 
 #include "ash/ash_export.h"
 #include "ash/common/media_delegate.h"
 #include "ash/common/metrics/user_metrics_action.h"
 #include "ash/common/wm/lock_state_observer.h"
 #include "base/observer_list.h"
 
 namespace views {
 class PointerDownWatcher;
 }
 
 namespace ash {
 
+class AcceleratorController;
 class AccessibilityDelegate;
 class BrightnessControlDelegate;
 class DisplayInfo;
 class FocusCycler;
 class KeyboardBrightnessControlDelegate;
 class KeyboardUI;
 class MaximizeModeController;
 class MruWindowTracker;
 class ScopedDisableInternalMouseAndKeyboard;
 class SessionStateDelegate;
@@ skipping 29 matching lines @@
   // through context.
   static void Set(WmShell* instance);
   static WmShell* Get();
   static bool HasInstance() { return instance_ != nullptr; }
 
   void Initialize();
   virtual void Shutdown();
 
   ShellDelegate* delegate() { return delegate_.get(); }
 
+  AcceleratorController* accelerator_controller() {
+    return accelerator_controller_.get();
+  }
+
   AccessibilityDelegate* accessibility_delegate() {
     return accessibility_delegate_.get();
   }
 
   BrightnessControlDelegate* brightness_control_delegate() {
     return brightness_control_delegate_.get();
   }
 
   FocusCycler* focus_cycler() { return focus_cycler_.get(); }
 
@@ skipping 198 matching lines @@
   void DeleteWindowSelectorController();
 
   void CreateMaximizeModeController();
   void DeleteMaximizeModeController();
 
   void CreateMruWindowTracker();
   void DeleteMruWindowTracker();
 
   void DeleteToastManager();
 
+  void SetAcceleratorController(
+      std::unique_ptr<AcceleratorController> accelerator_controller);
+
  private:
   friend class AcceleratorControllerTest;
   friend class Shell;
 
   static WmShell* instance_;
 
   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_;
   std::unique_ptr<KeyboardBrightnessControlDelegate>
       keyboard_brightness_control_delegate_;
   std::unique_ptr<KeyboardUI> keyboard_ui_;
   std::unique_ptr<MaximizeModeController> maximize_mode_controller_;
   std::unique_ptr<MediaDelegate> media_delegate_;
   std::unique_ptr<MruWindowTracker> mru_window_tracker_;
   std::unique_ptr<ShelfModel> shelf_model_;
   std::unique_ptr<SystemTrayNotifier> system_tray_notifier_;
   std::unique_ptr<SystemTrayDelegate> system_tray_delegate_;
   std::unique_ptr<ToastManager> toast_manager_;
   std::unique_ptr<WindowCycleController> window_cycle_controller_;
   std::unique_ptr<WindowSelectorController> window_selector_controller_;
 
   base::ObserverList<LockStateObserver> lock_state_observers_;
 
   bool simulate_modal_window_open_for_testing_ = false;
 
 #if defined(OS_CHROMEOS)
   std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_;
 #endif
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_WM_SHELL_H_