Short-term fix for CapsLock remapping on chromebooks with external keyboard

chrome/browser/ui/ash/event_rewriter.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 "chrome/browser/ui/ash/event_rewriter.h"
 
 #include <vector>
 
 #include "ash/shell.h"
 #include "base/logging.h"
@@ skipping 52 matching lines @@
     { XK_Control_L, XK_Control_R, XK_Control_L, XK_Control_R }},
   { chromeos::input_method::kAltKey, ui::EF_ALT_DOWN, Mod1Mask,
     ui::VKEY_MENU, { XK_Alt_L, XK_Alt_R, XK_Meta_L, XK_Meta_R }},
   { chromeos::input_method::kVoidKey, 0, 0U, ui::VKEY_UNKNOWN,
     { XK_VoidSymbol, XK_VoidSymbol, XK_VoidSymbol, XK_VoidSymbol }},
   { chromeos::input_method::kCapsLockKey, 0, 0U, ui::VKEY_CAPITAL,
     { XK_Caps_Lock, XK_Caps_Lock, XK_Caps_Lock, XK_Caps_Lock }},
 };
 
 const ModifierRemapping* kModifierRemappingCtrl = &kModifierRemappings[1];
-const ModifierRemapping* kModifierRemappingCapsLock = &kModifierRemappings[4];
 
 // A structure for converting |native_modifier| to a pair of |flag| and
 // |pref_name|.
 const struct ModifierFlagToPrefName {
   unsigned int native_modifier;
   int flag;
   const char* pref_name;
 } kModifierFlagToPrefName[] = {
   // TODO(yusukes): When the device has a Chrome keyboard (i.e. the one without
   // Caps Lock), we should not check kLanguageRemapCapsLockKeyTo.
@@ skipping 27 matching lines @@
     case XK_Meta_R:
     case XK_Shift_R:
     case XK_Super_R:
       return true;
     default:
       break;
   }
   return false;
 }
 
-bool HasChromeOSKeyboard() {
-  return CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kHasChromeOSKeyboard);
-}
-
 bool HasDiamondKey() {
   return CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kHasChromeOSDiamondKey);
 }
 
 bool IsMod3UsedByCurrentInputMethod() {
   // Since both German Neo2 XKB layout and Caps Lock depend on Mod3Mask,
   // it's not possible to make both features work. For now, we don't remap
   // Mod3Mask when Neo2 is in use.
   // TODO(yusukes): Remove the restriction.
@@ skipping 258 matching lines @@
 
   const PrefService* pref_service =
       pref_service_ ? pref_service_ : GetPrefService();
   if (!pref_service)
     return;
 
   // When a diamond key is not available, a Mod2Mask should not treated as a
   // configurable modifier because Mod2Mask may be worked as NumLock mask.
   // (cf. http://crbug.com/173956)
   const bool skip_mod2 = !HasDiamondKey();
-  // When a Chrome OS keyboard is available, the configuration UI for Caps Lock
-  // is not shown. Therefore, ignore the kLanguageRemapCapsLockKeyTo syncable
-  // pref. If Mod3 is in use, don't check the pref either.
-  const bool skip_mod3 =
-    HasChromeOSKeyboard() || IsMod3UsedByCurrentInputMethod();
+  // If Mod3 is used by the current input method, don't allow the CapsLock
+  // pref to remap it, or the keyboard behavior will be broken.
+  const bool skip_mod3 = IsMod3UsedByCurrentInputMethod();
 
   for (size_t i = 0; i < arraysize(kModifierFlagToPrefName); ++i) {
     if ((skip_mod2 && kModifierFlagToPrefName[i].native_modifier == Mod2Mask) ||
         (skip_mod3 && kModifierFlagToPrefName[i].native_modifier == Mod3Mask)) {
       continue;
     }
     if (original_native_modifiers &
         kModifierFlagToPrefName[i].native_modifier) {
       const ModifierRemapping* remapped_key =
           GetRemappedKey(kModifierFlagToPrefName[i].pref_name, *pref_service);
@@ skipping 71 matching lines @@
             GetRemappedKey(prefs::kLanguageRemapDiamondKeyTo, *pref_service);
       // Default behavior is Ctrl key.
       if (!remapped_key)
         remapped_key = kModifierRemappingCtrl;
       break;
     // On Chrome OS, XF86XK_Launch7 (F16) with Mod3Mask is sent when Caps Lock
     // is pressed (with one exception: when IsMod3UsedByCurrentInputMethod() is
     // true, the key generates XK_ISO_Level3_Shift with Mod3Mask, not
     // XF86XK_Launch7).
     case XF86XK_Launch7:
-      // When a Chrome OS keyboard is available, the configuration UI for Caps
-      // Lock is not shown. Therefore, ignore the kLanguageRemapCapsLockKeyTo
-      // syncable pref.
-      if (!HasChromeOSKeyboard())
-        remapped_key =
-            GetRemappedKey(prefs::kLanguageRemapCapsLockKeyTo, *pref_service);
-      // Default behavior is Caps Lock key.
-      if (!remapped_key)
-        remapped_key = kModifierRemappingCapsLock;
+      remapped_key =
+          GetRemappedKey(prefs::kLanguageRemapCapsLockKeyTo, *pref_service);
       break;
     case XK_Super_L:
     case XK_Super_R:
       // Rewrite Command-L/R key presses on an Apple keyboard to Control-L/R.
       if (IsAppleKeyboard())
         remapped_key = kModifierRemappingCtrl;
       else
         remapped_key =
             GetRemappedKey(prefs::kLanguageRemapSearchKeyTo, *pref_service);
       // Default behavior is Super key, hence don't remap the event if the pref
@@ skipping 495 matching lines @@
   const DeviceType type = EventRewriter::GetDeviceType(device_name);
   if (type == kDeviceAppleKeyboard) {
     VLOG(1) << "Apple keyboard '" << device_name << "' connected: "
             << "id=" << device_id;
   }
   // Always overwrite the existing device_id since the X server may reuse a
   // device id for an unattached device.
   device_id_to_type_[device_id] = type;
   return type;
 }