Move AcceleratorController from WmShell to Shell

ash/shell.h

 // Copyright (c) 2012 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_SHELL_H_
 #define ASH_SHELL_H_
 
 #include <memory>
 #include <utility>
 #include <vector>
@@ skipping 70 matching lines @@
 class AcceleratorFilter;
 class CompoundEventFilter;
 class FocusController;
 class ShadowController;
 class VisibilityController;
 class WindowModalityController;
 }
 
 namespace ash {
 
-class AcceleratorControllerDelegateAura;
+class AcceleratorController;
 class AccessibilityDelegate;
 class AppListDelegateImpl;
 class AshNativeCursorManager;
 class AshTouchTransformController;
 class AutoclickController;
 class BluetoothNotificationController;
 class DisplayColorManager;
 class DisplayConfigurationController;
 class DisplayErrorObserver;
 class DragDropController;
@@ skipping 164 matching lines @@
 
   // Deactivates the virtual keyboard.
   void DeactivateKeyboard();
 
   // Test if MaximizeModeWindowManager is not enabled, and if
   // MaximizeModeController is not currently setting a display rotation. Or if
   // the |resolution_notification_controller_| is not showing its confirmation
   // dialog. If true then changes to display settings can be saved.
   bool ShouldSaveDisplaySettings();
 
-  AcceleratorControllerDelegateAura* accelerator_controller_delegate() {
-    return accelerator_controller_delegate_.get();
+  AcceleratorController* accelerator_controller() {
+    return accelerator_controller_.get();
   }
-
   AccessibilityDelegate* accessibility_delegate() {
     return accessibility_delegate_.get();
   }
   app_list::AppList* app_list() { return app_list_.get(); }
   const scoped_refptr<base::SequencedWorkerPool>& blocking_pool() {
     return blocking_pool_;
   }
   display::DisplayManager* display_manager() { return display_manager_.get(); }
   DisplayConfigurationController* display_configuration_controller() {
     return display_configuration_controller_.get();
@@ skipping 271 matching lines @@
   static bool initially_hide_cursor_;
 
   std::unique_ptr<ScopedOverviewAnimationSettingsFactoryAura>
       scoped_overview_animation_settings_factory_;
   std::unique_ptr<WmShell> wm_shell_;
 
   // The CompoundEventFilter owned by aura::Env object.
   std::unique_ptr<::wm::CompoundEventFilter> env_filter_;
 
   std::unique_ptr<UserMetricsRecorder> user_metrics_recorder_;
-  std::unique_ptr<AcceleratorControllerDelegateAura>
-      accelerator_controller_delegate_;
   std::unique_ptr<SessionStateDelegate> session_state_delegate_;
   std::unique_ptr<WindowPositioner> window_positioner_;
 
+  std::unique_ptr<AcceleratorController> accelerator_controller_;
   std::unique_ptr<AccessibilityDelegate> accessibility_delegate_;
   std::unique_ptr<PaletteDelegate> palette_delegate_;
   std::unique_ptr<DragDropController> drag_drop_controller_;
   std::unique_ptr<ResizeShadowController> resize_shadow_controller_;
   std::unique_ptr<ShellDelegate> shell_delegate_;
   std::unique_ptr<ToastManager> toast_manager_;
   std::unique_ptr<WallpaperController> wallpaper_controller_;
   std::unique_ptr<WallpaperDelegate> wallpaper_delegate_;
   std::unique_ptr<::wm::ShadowController> shadow_controller_;
   std::unique_ptr<::wm::VisibilityController> visibility_controller_;
@@ skipping 108 matching lines @@
   base::ObserverList<ShellObserver> shell_observers_;
 
   scoped_refptr<base::SequencedWorkerPool> blocking_pool_;
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_H_