Wires up registering accelerators from mash with the wm

ash/common/accelerators/accelerator_controller.cc

 // 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.
 
 #include "ash/common/accelerators/accelerator_controller.h"
 
 #include "ash/common/accelerators/accelerator_commands.h"
 #include "ash/common/accelerators/accelerator_controller_delegate.h"
 #include "ash/common/accelerators/debug_commands.h"
 #include "ash/common/accessibility_delegate.h"
@@ skipping 310 matching lines @@
 }
 
 #endif  // defined(OS_CHROMEOS)
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // AcceleratorController, public:
 
 AcceleratorController::AcceleratorController(
-    AcceleratorControllerDelegate* delegate)
+    AcceleratorControllerDelegate* delegate,
+    ui::AcceleratorManagerDelegate* manager_delegate)
     : delegate_(delegate),
-      accelerator_manager_(new ui::AcceleratorManager),
+      accelerator_manager_(new ui::AcceleratorManager(manager_delegate)),
       accelerator_history_(new ui::AcceleratorHistory) {
   Init();
 }
 
 AcceleratorController::~AcceleratorController() {}
 
 void AcceleratorController::Register(const ui::Accelerator& accelerator,
                                      ui::AcceleratorTarget* target) {
   accelerator_manager_->Register(
       accelerator, ui::AcceleratorManager::kNormalPriority, target);
@@ skipping 483 matching lines @@
   if (wm_shell->mru_window_tracker()->BuildMruWindowList().empty() &&
       actions_needing_window_.find(action) != actions_needing_window_.end()) {
     wm_shell->accessibility_delegate()->TriggerAccessibilityAlert(
         A11Y_ALERT_WINDOW_NEEDED);
     return RESTRICTION_PREVENT_PROCESSING_AND_PROPAGATION;
   }
   return RESTRICTION_NONE;
 }
 
 }  // namespace ash