| Index: ash/common/accelerators/accelerator_controller.cc
|
| diff --git a/ash/common/accelerators/accelerator_controller.cc b/ash/common/accelerators/accelerator_controller.cc
|
| index 37ab7983e63e40c3318b6e149d91bbd696889522..b8be032df449ec8cef9ed43bcad19218c0c2f37f 100644
|
| --- a/ash/common/accelerators/accelerator_controller.cc
|
| +++ b/ash/common/accelerators/accelerator_controller.cc
|
| @@ -328,9 +328,10 @@ void HandleVolumeUp(const ui::Accelerator& accelerator) {
|
| // 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();
|
| }
|
|
|