Fix CapsLock remapping.

ui/events/ozone/evdev/event_modifiers_evdev.h

 // 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.
 
 #ifndef UI_EVENTS_OZONE_EVDEV_EVENT_MODIFIERS_EVDEV_H_
 #define UI_EVENTS_OZONE_EVDEV_EVENT_MODIFIERS_EVDEV_H_
 
 #include "base/basictypes.h"
 #include "ui/events/ozone/evdev/events_ozone_evdev_export.h"
 
 namespace ui {
 
 enum {
   EVDEV_MODIFIER_NONE,
-  EVDEV_MODIFIER_CAPS_LOCK,
+  EVDEV_MODIFIER_CAPS_LOCK_HELD,
+  EVDEV_MODIFIER_CAPS_LOCKED_STATE,
   EVDEV_MODIFIER_SHIFT,
   EVDEV_MODIFIER_CONTROL,
   EVDEV_MODIFIER_ALT,
   EVDEV_MODIFIER_LEFT_MOUSE_BUTTON,
   EVDEV_MODIFIER_MIDDLE_MOUSE_BUTTON,
   EVDEV_MODIFIER_RIGHT_MOUSE_BUTTON,
   EVDEV_MODIFIER_COMMAND,
   EVDEV_MODIFIER_ALTGR,
   EVDEV_NUM_MODIFIERS
 };
@@ skipping 23 matching lines @@
 
   // Record key press or release for locking modifier key (caps lock).
   void UpdateModifierLock(unsigned int modifier, bool down);
 
   // Directly set the state of a locking modifier key (caps lock).
   void SetModifierLock(unsigned int modifier, bool locked);
 
   // Return current flags to use for incoming events.
   int GetModifierFlags();
 
+  // Return current flags that are "locked".
+  int GetModifierLockFlags();
+
   // Return the mask for the specified modifier.
   static int GetEventFlagFromModifier(unsigned int modifier);
 
  private:
   // Count of keys pressed for each modifier.
   int modifiers_down_[EVDEV_NUM_MODIFIERS];
 
   // Mask of modifier flags currently "locked".
   int modifier_flags_locked_;
 
   // Mask of modifier flags currently active (nonzero keys pressed xor locked).
   int modifier_flags_;
 
   // Update modifier_flags_ from modifiers_down_ and modifier_flags_locked_.
   void UpdateFlags(unsigned int modifier);
 
   DISALLOW_COPY_AND_ASSIGN(EventModifiersEvdev);
 };
 
 }  // namspace ui
 
 #endif  // UI_EVENTS_OZONE_EVDEV_EVENT_MODIFIERS_EVDEV_H_