Fixing french keyboard handling

chrome/browser/ui/views/ash/ime_controller_chromeos.cc

Index: chrome/browser/ui/views/ash/ime_controller_chromeos.cc
diff --git a/chrome/browser/ui/views/ash/ime_controller_chromeos.cc b/chrome/browser/ui/views/ash/ime_controller_chromeos.cc
index 1934357e90140bc62cc7e8ea681e6ab6cc68b498..ded54444ca6d1e8e615c051f99125f4dffded79f 100644
--- a/chrome/browser/ui/views/ash/ime_controller_chromeos.cc
+++ b/chrome/browser/ui/views/ash/ime_controller_chromeos.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/ui/views/ash/ime_controller_chromeos.h"
 
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
+#include "ui/base/accelerators/accelerator.h"
 
 bool ImeController::HandleNextIme() {
   chromeos::input_method::InputMethodManager* manager =
@@ -23,3 +24,30 @@ bool ImeController::HandleSwitchIme(const ui::Accelerator& accelerator) {
       chromeos::input_method::InputMethodManager::GetInstance();
   return manager->SwitchInputMethod(accelerator);
 }
+
+ui::Accelerator ImeController::RemapAccelerator(
+    const ui::Accelerator& accelerator) {
+  ui::KeyboardCode key = accelerator.key_code();
+  int modifiers = accelerator.modifiers();
+  // 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 (key >= ui::VKEY_0 && key <= ui::VKEY_9) {
+    // A keyboard layout can get changed by the user, so we perform quickly
+    // this cheap layout test.
+    // See http://crbug.com/129017 for more details.
+    if (IsFrenchKeyboard())
+      // We toggle the shift key to get the correct accelerator from our table.

[Daniel Erat, 2012/05/30 17:51:06]

nit: add curly braces now that there's a comment between the if condition and
the statement

[Mr4D (OOO till 08-26), 2012/05/30 18:09:46]

Done.

+      modifiers ^= ui::EF_SHIFT_DOWN;
+  }
+  return ui::Accelerator(key, modifiers);
+}
+
+bool ImeController::IsFrenchKeyboard() const {
+  chromeos::input_method::InputMethodManager* manager =
+      chromeos::input_method::InputMethodManager::GetInstance();
+  const chromeos::input_method::InputMethodDescriptor& descriptor =
+      manager->GetCurrentInputMethod();
+  const std::string& layout = descriptor.id();
+  return (layout == "xkb:fr::fra" || layout == "xkb:be::fra");
+}