Listen to XI_HierarchyChanged events and call setxkbmap when needed.

chrome/browser/chromeos/input_method/xkeyboard.cc

 // Copyright (c) 2011 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 "chrome/browser/chromeos/input_method/xkeyboard.h"
 
 #include <utility>
 
 #include <X11/XKBlib.h>
 #include <X11/Xlib.h>
@@ skipping 119 matching lines @@
  public:
   // Returns the singleton instance of the class. Use LeakySingletonTraits.
   // We don't delete the instance at exit.
   static XKeyboard* GetInstance() {
     return Singleton<XKeyboard, LeakySingletonTraits<XKeyboard> >::get();
   }
 
   // Sets the current keyboard layout to |layout_name|. This function does not
   // change the current mapping of the modifier keys. Returns true on success.
   bool SetLayout(const std::string& layout_name) {
-    if (SetLayoutInternal(layout_name, current_modifier_map_)) {
+    if (SetLayoutInternal(layout_name, current_modifier_map_, false)) {
       current_layout_name_ = layout_name;
       return true;
     }
     return false;
   }
 
+  // Sets the current keyboard layout to |current_layout_name_| again.
+  // See crosbug.com/15851 for details.
+  bool ReapplyLayout() {
+    if (current_layout_name_.empty()) {
+      LOG(ERROR) << "Can't reapply XKB layout: layout unknown";
+      return false;
+    }
+    VLOG(1) << "ReapplyLayout: setting to " << current_layout_name_;
+    return SetLayoutInternal(
+        current_layout_name_, current_modifier_map_, true /* force */);
+  }
+
   // Remaps modifier keys. This function does not change the current keyboard
   // layout. Returns true on success.
   bool RemapModifierKeys(const ModifierMap& modifier_map) {
     const std::string layout_name = current_layout_name_.empty() ?
         kDefaultLayoutName : current_layout_name_;
-    if (SetLayoutInternal(layout_name, modifier_map)) {
+    if (SetLayoutInternal(layout_name, modifier_map, false)) {
       current_layout_name_ = layout_name;
       current_modifier_map_ = modifier_map;
       return true;
     }
     return false;
   }
 
   // Turns on and off the auto-repeat of the keyboard. Returns true on success.
   // TODO(yusukes): Remove this function.
   bool SetAutoRepeatEnabled(bool enabled) {
@@ skipping 40 matching lines @@
       ModifierKey key = kCustomizableKeys[i];
       current_modifier_map_.push_back(ModifierKeyPair(key, key));
     }
   }
   ~XKeyboard() {
   }
 
   // This function is used by SetLayout() and RemapModifierKeys(). Calls
   // setxkbmap command if needed, and updates the last_full_layout_name_ cache.
   bool SetLayoutInternal(const std::string& layout_name,
-                         const ModifierMap& modifier_map) {
+                         const ModifierMap& modifier_map,
+                         bool force) {
     if (!CrosLibrary::Get()->EnsureLoaded()) {
       // We should not try to change a layout inside ui_tests.
       return false;
     }
 
     const std::string layouts_to_set = CreateFullXkbLayoutName(
         layout_name, modifier_map);
     if (layouts_to_set.empty()) {
       return false;
     }
 
     if (!current_layout_name_.empty()) {
       const std::string current_layout = CreateFullXkbLayoutName(
           current_layout_name_, current_modifier_map_);
-      if (current_layout == layouts_to_set) {
+      if (!force && (current_layout == layouts_to_set)) {
         DLOG(INFO) << "The requested layout is already set: " << layouts_to_set;
         return true;
       }
     }
 
     // Turn off caps lock if there is no kCapsLockKey in the remapped keys.
     if (!ContainsModifierKeyAsReplacement(
             modifier_map, kCapsLockKey)) {
       SetCapsLockEnabled(false);
     }
@@ skipping 145 matching lines @@
       return true;
     }
   }
   return false;
 }
 
 bool SetCurrentKeyboardLayoutByName(const std::string& layout_name) {
   return XKeyboard::GetInstance()->SetLayout(layout_name);
 }
 
+bool ReapplyCurrentKeyboardLayout() {
+  return XKeyboard::GetInstance()->ReapplyLayout();
+}
+
 bool RemapModifierKeys(const ModifierMap& modifier_map) {
   return XKeyboard::GetInstance()->RemapModifierKeys(modifier_map);
 }
 
 bool SetAutoRepeatEnabled(bool enabled) {
   return XKeyboard::GetInstance()->SetAutoRepeatEnabled(enabled);
 }
 
 bool SetAutoRepeatRate(const AutoRepeatRate& rate) {
   return XKeyboard::GetInstance()->SetAutoRepeatRate(rate);
 }
 
 }  // namespace input_method
 }  // namespace chromeos