Index: ash/accelerators/accelerator_controller.cc |
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc |
index 20882abecf3eaa2c0f58ecb86df7d5d03b6002dd..9ce54c7a5a461dc7cf8186296d86c5cdb2a3cd30 100644 |
--- a/ash/accelerators/accelerator_controller.cc |
+++ b/ash/accelerators/accelerator_controller.cc |
@@ -781,14 +781,12 @@ void AcceleratorController::UnregisterAll(ui::AcceleratorTarget* target) { |
} |
bool AcceleratorController::Process(const ui::Accelerator& accelerator) { |
- if (ime_control_delegate_) |
- return accelerator_manager_->Process(accelerator); |
return accelerator_manager_->Process(accelerator); |
} |
bool AcceleratorController::IsRegistered( |
const ui::Accelerator& accelerator) const { |
- return accelerator_manager_->GetCurrentTarget(accelerator) != NULL; |
+ return accelerator_manager_->IsRegistered(accelerator); |
} |
bool AcceleratorController::IsPreferred( |