Fix CapsLock remapping.

chrome/browser/chromeos/events/event_rewriter.cc

 // Copyright 2014 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/events/event_rewriter.h"
 
 #include <vector>
 
 #include "ash/sticky_keys/sticky_keys_controller.h"
 #include "ash/wm/window_state.h"
@@ skipping 619 matching lines @@
       // F15 is not a modifier key, so we need to track its state directly.
       if (key_event.type() == ui::ET_KEY_PRESSED) {
         int remapped_flag = remapped_key->flag;
         if (remapped_key->remap_to == input_method::kCapsLockKey)
           remapped_flag |= ui::EF_CAPS_LOCK_DOWN;
         current_diamond_key_modifier_flags_ = remapped_flag;
       } else {
         current_diamond_key_modifier_flags_ = ui::EF_NONE;
       }
       break;
-    // On Chrome OS, XF86XK_Launch7 (F16) with Mod3Mask is sent when Caps Lock
-    // is pressed (with one exception: when
+    // On X11 Chrome OS, XF86XK_Launch7 (F16) with Mod3Mask is sent when Caps
+    // Lock is pressed (with one exception: when
     // IsISOLevel5ShiftUsedByCurrentInputMethod() is true, the key generates
     // XK_ISO_Level3_Shift with Mod3Mask, not XF86XK_Launch7).

[Daniel Erat, 2015/02/25 22:13:45]

does this comment need to be updated to describe where VKEY_CAPITAL comes from,
or is that what the "XK_ISO_Level3_Shift with Mod3Mask" part refers to?

[kpschoedel, 2015/02/25 23:03:06]

Using spang's suggestion & removing this file from the CL.

     case ui::VKEY_F16:
+    case ui::VKEY_CAPITAL:
       characteristic_flag = ui::EF_CAPS_LOCK_DOWN;
       remapped_key =
           GetRemappedKey(prefs::kLanguageRemapCapsLockKeyTo, *pref_service);
       break;
     case ui::VKEY_LWIN:
     case ui::VKEY_RWIN:
       characteristic_flag = ui::EF_COMMAND_DOWN;
       // Rewrite Command-L/R key presses on an Apple keyboard to Control.
       if (IsAppleKeyboard()) {
         DCHECK_EQ(ui::VKEY_CONTROL, kModifierRemappingCtrl->key_code);
@@ skipping 344 matching lines @@
   // TODO(spang): Figure out where we can get keyboard vendor/product id from in
   // Ozone/Freon version.
   return KeyboardDeviceAddedInternal(device_id,
                                      "keyboard",
                                      kUnknownVendorId,
                                      kUnknownProductId);
 #endif
 }
 
 }  // namespace chromeos