Removes ImeController::UsingFrenchInputMethod and thus ImeControlDelegate::RemapAccelerator.

RemapAccelerator was introduced by cl https://chromiumcodereview.appspot.com/10452042
which was to solve the issue that FR keyboard issues the number keys with key codes other
than VKEY_0 - VKEY_9.
That issue has been fixed in Ozone now, so FR keyboard can issue VKEY_0-VKEY_9 for number
keys correctly. Therefore, RemapAccelerator is useless.

BUG=572219
TEST=No compile error. Issue 129017 doesn't repro.

Review URL: https://codereview.chromium.org/1601063002

Cr-Commit-Position: refs/heads/master@{#370239}

3 files changed, 4 insertions, 21 deletions

diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
index 25fde9c..91d21a6 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.
 
diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc
index b9304b6..5967a04 100644
--- a/ash/accelerators/accelerator_controller_unittest.cc
+++ b/ash/accelerators/accelerator_controller_unittest.cc
@@ -151,10 +151,6 @@ class DummyImeControlDelegate : public ImeControlDelegate {
   int handle_switch_ime_count() const {
     return handle_switch_ime_count_;
   }
-  ui::Accelerator RemapAccelerator(
-      const ui::Accelerator& accelerator) override {
-    return ui::Accelerator(accelerator);
-  }
 
  private:
   int handle_next_ime_count_;
diff --git a/ash/ime_control_delegate.h b/ash/ime_control_delegate.h
index e90b48f..5dbc52c 100644
--- a/ash/ime_control_delegate.h
+++ b/ash/ime_control_delegate.h
@@ -33,11 +33,6 @@ class ImeControlDelegate {
 
   // Switches to the IME associated with |accelerator|.
   virtual void HandleSwitchIme(const ui::Accelerator& accelerator) = 0;
-
-  // Checks for special language anomalies and re-map the |accelerator|
-  // accordingly.
-  virtual ui::Accelerator RemapAccelerator(
-      const ui::Accelerator& accelerator) = 0;
 };
 
 }  // namespace ash