Separates out accelerators using non-common types

ash/shell.h

Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index bbb4e20bb69fa3672d052c2232da58451625cebf..dc73516515ffc4b5208b4551935de6f15bd0c9f5 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -80,6 +80,7 @@ class WindowModalityController;
 namespace ash {
 
 class AcceleratorController;
+class AcceleratorControllerDelegateAura;
 class AppListController;
 class AshNativeCursorManager;
 class AutoclickController;
@@ -312,6 +313,9 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
   AcceleratorController* accelerator_controller() {
     return accelerator_controller_.get();
   }
+  AcceleratorControllerDelegateAura* accelerator_controller_delegate() {
+    return accelerator_controller_delegate_.get();
+  }
 
   DisplayManager* display_manager() { return display_manager_.get(); }
   DisplayConfigurationController* display_configuration_controller() {
@@ -582,6 +586,8 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
   std::vector<WindowAndBoundsPair> to_restore_;
 
   std::unique_ptr<UserMetricsRecorder> user_metrics_recorder_;
+  std::unique_ptr<AcceleratorControllerDelegateAura>
+      accelerator_controller_delegate_;
   std::unique_ptr<AcceleratorController> accelerator_controller_;
   std::unique_ptr<UserWallpaperDelegate> user_wallpaper_delegate_;
   std::unique_ptr<SessionStateDelegate> session_state_delegate_;