| Index: ash/accelerators/accelerator_controller.cc
|
| diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
|
| index 84f565c63891943c066bc245dd8377122142994c..c9f0d30de9733c96b93959e906a7bed0843e3eb6 100644
|
| --- a/ash/accelerators/accelerator_controller.cc
|
| +++ b/ash/accelerators/accelerator_controller.cc
|
| @@ -718,15 +718,15 @@ void AcceleratorController::UnregisterAll(ui::AcceleratorTarget* target) {
|
|
|
| bool AcceleratorController::Process(const ui::Accelerator& accelerator) {
|
| if (ime_control_delegate_) {
|
| - return accelerator_manager_->Process(
|
| + return accelerator_manager_->ProcessAccelerator(
|
| ime_control_delegate_->RemapAccelerator(accelerator));
|
| }
|
| - return accelerator_manager_->Process(accelerator);
|
| + return accelerator_manager_->ProcessAccelerator(accelerator);
|
| }
|
|
|
| bool AcceleratorController::IsRegistered(
|
| const ui::Accelerator& accelerator) const {
|
| - return accelerator_manager_->GetCurrentTarget(accelerator) != NULL;
|
| + return accelerator_manager_->GetTargetForAccelerator(accelerator) != NULL;
|
| }
|
|
|
| bool AcceleratorController::IsPreferred(
|
|
|