Move AcceleratorController from WmShell to Shell

ash/mus/bridge/wm_shell_mus.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/mus/bridge/wm_shell_mus.h"
 
 #include <utility>
 
 #include "ash/common/accelerators/accelerator_controller.h"
 #include "ash/common/key_event_watcher.h"
@@ skipping 107 matching lines @@
     WindowManager* window_manager,
     views::PointerWatcherEventRouter* pointer_watcher_event_router,
     bool create_session_state_delegate_stub)
     : window_manager_(window_manager),
       primary_root_window_(primary_root_window),
       pointer_watcher_event_router_(pointer_watcher_event_router) {
   if (create_session_state_delegate_stub)
     session_state_delegate_ = base::MakeUnique<SessionStateDelegateStub>();
   DCHECK(primary_root_window_);
 
-  uint16_t accelerator_namespace_id = 0u;
-  const bool add_result =
-      window_manager->GetNextAcceleratorNamespaceId(&accelerator_namespace_id);
-  // WmShellMus is created early on, so that this should always succeed.
-  DCHECK(add_result);
-  accelerator_controller_delegate_.reset(
-      new AcceleratorControllerDelegateMus(window_manager_));
-  accelerator_controller_registrar_.reset(new AcceleratorControllerRegistrar(
-      window_manager_, accelerator_namespace_id));
-  SetAcceleratorController(base::MakeUnique<AcceleratorController>(
-      accelerator_controller_delegate_.get(),
-      accelerator_controller_registrar_.get()));
   immersive_handler_factory_.reset(new ImmersiveHandlerFactoryMus);
 
   SetKeyboardUI(KeyboardUIMus::Create(window_manager_->connector()));
 }
 
 WmShellMus::~WmShellMus() {
 }
 
 // static
 WmShellMus* WmShellMus::Get() {
@@ skipping 238 matching lines @@
 void WmShellMus::CreatePointerWatcherAdapter() {
   // Only needed in WmShellAura, which has specific creation order.
 }
 
 void WmShellMus::CreatePrimaryHost() {}
 
 void WmShellMus::InitHosts(const ShellInitParams& init_params) {
   window_manager_->CreatePrimaryRootWindowController(
       base::WrapUnique(init_params.primary_window_tree_host));
 }
+
+std::unique_ptr<AcceleratorController>
+WmShellMus::CreateAcceleratorController() {
+  DCHECK(!accelerator_controller_delegate_);
+  uint16_t accelerator_namespace_id = 0u;
+  const bool add_result =
+      window_manager_->GetNextAcceleratorNamespaceId(&accelerator_namespace_id);
+  // WmShellMus is created early on, so that GetNextAcceleratorNamespaceId()
+  // should always succeed.
+  DCHECK(add_result);
+
+  accelerator_controller_delegate_ =
+      base::MakeUnique<AcceleratorControllerDelegateMus>(window_manager_);
+  accelerator_controller_registrar_ =
+      base ::MakeUnique<AcceleratorControllerRegistrar>(
+          window_manager_, accelerator_namespace_id);
+  return base::MakeUnique<AcceleratorController>(
+      accelerator_controller_delegate_.get(),
+      accelerator_controller_registrar_.get());
+}
+
 }  // namespace mus
 }  // namespace ash