Move AcceleratorController from WmShell to Shell

ash/aura/wm_shell_aura.cc

 // 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.
 
 #include "ash/aura/wm_shell_aura.h"
 
 #include <utility>
 
+#include "ash/accelerators/accelerator_controller_delegate_aura.h"
 #include "ash/aura/key_event_watcher_aura.h"
 #include "ash/aura/pointer_watcher_adapter.h"
+#include "ash/common/accelerators/accelerator_controller.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shell_delegate.h"
 #include "ash/common/shell_observer.h"
 #include "ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h"
 #include "ash/common/wm/mru_window_tracker.h"
 #include "ash/common/wm/overview/window_selector_controller.h"
 #include "ash/common/wm_display_observer.h"
 #include "ash/common/wm_window.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/host/ash_window_tree_host_init_params.h"
@@ skipping 23 matching lines @@
 #if defined(USE_OZONE)
 #include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h"
 #endif
 
 namespace ash {
 
 WmShellAura::WmShellAura() {}
 
 WmShellAura::~WmShellAura() {}
 
+// static
+WmShellAura* WmShellAura::Get() {
+  CHECK(!WmShell::Get()->IsRunningInMash());
+  return static_cast<WmShellAura*>(WmShell::Get());
+}
+
 void WmShellAura::Shutdown() {
   if (added_display_observer_)
     Shell::GetInstance()->window_tree_host_manager()->RemoveObserver(this);
 
   pointer_watcher_adapter_.reset();
 
   WmShell::Shutdown();
 
   Shell::GetInstance()->window_tree_host_manager()->Shutdown();
 }
@@ skipping 198 matching lines @@
   Shell::GetInstance()->window_tree_host_manager()->Start();
   AshWindowTreeHostInitParams ash_init_params;
   Shell::GetInstance()->window_tree_host_manager()->CreatePrimaryHost(
       ash_init_params);
 }
 
 void WmShellAura::InitHosts(const ShellInitParams& init_params) {
   Shell::GetInstance()->window_tree_host_manager()->InitHosts();
 }
 
+std::unique_ptr<AcceleratorController>
+WmShellAura::CreateAcceleratorController() {
+  DCHECK(!accelerator_controller_delegate_);
+  accelerator_controller_delegate_ =
+      base::MakeUnique<AcceleratorControllerDelegateAura>();
+  return base::MakeUnique<AcceleratorController>(
+      accelerator_controller_delegate_.get(), nullptr);
+}
+
 void WmShellAura::SessionStateChanged(session_manager::SessionState state) {
   // Create the shelf if necessary.
   WmShell::SessionStateChanged(state);
 
   // Recreate the keyboard after initial login and after multiprofile login.
   if (state == session_manager::SessionState::ACTIVE)
     Shell::GetInstance()->CreateKeyboard();
 }
 
 void WmShellAura::OnDisplayConfigurationChanging() {
   for (auto& observer : display_observers_)
     observer.OnDisplayConfigurationChanging();
 }
 
 void WmShellAura::OnDisplayConfigurationChanged() {
   for (auto& observer : display_observers_)
     observer.OnDisplayConfigurationChanged();
 }
 
 }  // namespace ash