Fixing french keyboard handling

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 "ash/accelerators/accelerator_table.h"
 #include "ash/ash_switches.h"
 #include "ash/caps_lock_delegate.h"
 #include "ash/desktop_background/desktop_background_controller.h"
@@ skipping 224 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) {
+  // On French keyboards the user needs to press a number key in conjunction
+  // with the shift key. To get the right accelerator from our static table
+  // we modify the received accelerator to match this.
+  if (accelerator.key_code() >= ui::VKEY_0 &&

[mazda, 2012/05/25 22:52:38]

I'm worried about letting AcceleratorController have too much knowledge on
keyboard layouts.
How about adding something like RemapAccelerator to ImeControlDelegate, which
returns a corresponding Accelerator in US keyboard for the given accelerator
based on the current layout, and moving this logic to ImeController?

[Mr4D (OOO till 08-26), 2012/05/29 14:59:25]

Done

+      accelerator.key_code() <= ui::VKEY_9) {
+    // A keyboard layout can get changed by the user, so we need to dynamically
+    // check if a modification is required.
+    if (ime_control_delegate_.get() &&
+        ime_control_delegate_->IsFrenchKeyboard()) {
+      // We toggle the shift key to get the correct accelerator from our table.
+      return accelerator_manager_->Process(
+                 ui::Accelerator(accelerator.key_code(),
+                                 accelerator.modifiers() ^ ui::EF_SHIFT_DOWN));
+    }
+  }
   return accelerator_manager_->Process(accelerator);
 }
 
 bool AcceleratorController::IsRegistered(
     const ui::Accelerator& accelerator) const {
   return accelerator_manager_->GetCurrentTarget(accelerator) != NULL;
 }
 
 void AcceleratorController::SetBrightnessControlDelegate(
     scoped_ptr<BrightnessControlDelegate> brightness_control_delegate) {
@@ skipping 279 matching lines @@
     // Then set this one as active.
     Shell::GetInstance()->launcher()->ActivateLauncherItem(found_index);
   }
 }
 
 bool AcceleratorController::CanHandleAccelerators() const {
   return true;
 }
 
 }  // namespace ash