Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(43)

Unified Diff: ash/accelerators/accelerator_controller.cc

Issue 1601063002: Removes ImeController::UsingFrenchInputMethod and thus ImeControlDelegate::RemapAccelerator. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ash/accelerators/accelerator_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/accelerators/accelerator_controller.cc
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
index 25fde9c36bfe09aa2b58c0fb5bcdbf70dc8a99f6..91d21a6583e5195482be54adcf750cd3c499e425 100644
--- a/ash/accelerators/accelerator_controller.cc
+++ b/ash/accelerators/accelerator_controller.cc
@@ -775,10 +775,8 @@ void AcceleratorController::UnregisterAll(ui::AcceleratorTarget* target) {
}
bool AcceleratorController::Process(const ui::Accelerator& accelerator) {
- if (ime_control_delegate_) {
- return accelerator_manager_->Process(
- ime_control_delegate_->RemapAccelerator(accelerator));
- }
+ if (ime_control_delegate_)
+ return accelerator_manager_->Process(accelerator);
return accelerator_manager_->Process(accelerator);
}
@@ -789,11 +787,8 @@ bool AcceleratorController::IsRegistered(
bool AcceleratorController::IsPreferred(
const ui::Accelerator& accelerator) const {
- const ui::Accelerator remapped_accelerator = ime_control_delegate_.get() ?
- ime_control_delegate_->RemapAccelerator(accelerator) : accelerator;
-
std::map<ui::Accelerator, AcceleratorAction>::const_iterator iter =
- accelerators_.find(remapped_accelerator);
+ accelerators_.find(accelerator);
if (iter == accelerators_.end())
return false; // not an accelerator.
@@ -802,11 +797,8 @@ bool AcceleratorController::IsPreferred(
bool AcceleratorController::IsReserved(
const ui::Accelerator& accelerator) const {
- const ui::Accelerator remapped_accelerator = ime_control_delegate_.get() ?
- ime_control_delegate_->RemapAccelerator(accelerator) : accelerator;
-
std::map<ui::Accelerator, AcceleratorAction>::const_iterator iter =
- accelerators_.find(remapped_accelerator);
+ accelerators_.find(accelerator);
if (iter == accelerators_.end())
return false; // not an accelerator.
« no previous file with comments | « no previous file | ash/accelerators/accelerator_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698