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

ash/accelerators/accelerator_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/accelerators/accelerator_controller.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <utility>
@@ skipping 757 matching lines @@
 void AcceleratorController::Unregister(const ui::Accelerator& accelerator,
                                        ui::AcceleratorTarget* target) {
   accelerator_manager_->Unregister(accelerator, target);
 }
 
 void AcceleratorController::UnregisterAll(ui::AcceleratorTarget* target) {
   accelerator_manager_->UnregisterAll(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);
 }
 
 bool AcceleratorController::IsRegistered(
     const ui::Accelerator& accelerator) const {
   return accelerator_manager_->GetCurrentTarget(accelerator) != NULL;
 }
 
 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.
 
   return preferred_actions_.find(iter->second) != preferred_actions_.end();
 }
 
 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.
 
   return reserved_actions_.find(iter->second) != reserved_actions_.end();
 }
 
 bool AcceleratorController::IsDeprecated(
     const ui::Accelerator& accelerator) const {
   return deprecated_accelerators_.count(accelerator) != 0;
 }
@@ skipping 633 matching lines @@
 }
 
 void AcceleratorController::SetKeyboardBrightnessControlDelegate(
     scoped_ptr<KeyboardBrightnessControlDelegate>
     keyboard_brightness_control_delegate) {
   keyboard_brightness_control_delegate_ =
       std::move(keyboard_brightness_control_delegate);
 }
 
 }  // namespace ash