Revert of Fix CapsLock remapping.

ui/events/ozone/evdev/keyboard_evdev.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 "ui/events/ozone/evdev/keyboard_evdev.h"
 
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/keycodes/dom4/keycode_converter.h"
@@ skipping 28 matching lines @@
       return EVDEV_MODIFIER_MIDDLE_MOUSE_BUTTON;
     case EF_RIGHT_MOUSE_BUTTON:
       return EVDEV_MODIFIER_RIGHT_MOUSE_BUTTON;
     case EF_COMMAND_DOWN:
       return EVDEV_MODIFIER_COMMAND;
     default:
       return EVDEV_MODIFIER_NONE;
   }
 }
 
+bool IsModifierLock(int evdev_modifier) {
+  return evdev_modifier == EVDEV_MODIFIER_CAPS_LOCK;
+}
+
 }  // namespace
 
 KeyboardEvdev::KeyboardEvdev(EventModifiersEvdev* modifiers,
                              KeyboardLayoutEngine* keyboard_layout_engine,
                              const EventDispatchCallback& callback)
     : callback_(callback),
       modifiers_(modifiers),
       keyboard_layout_engine_(keyboard_layout_engine),
       repeat_enabled_(true),
       repeat_key_(KEY_RESERVED) {
@@ skipping 52 matching lines @@
 }
 
 void KeyboardEvdev::UpdateModifier(int modifier_flag, bool down) {
   if (modifier_flag == EF_NONE)
     return;
 
   int modifier = EventFlagToEvdevModifier(modifier_flag);
   if (modifier == EVDEV_MODIFIER_NONE)
     return;
 
-  // TODO post-X11: Revise remapping to not use EF_MOD3_DOWN.
-  // Currently EF_MOD3_DOWN means that the CapsLock key is currently down,
-  // and EF_CAPS_LOCK_DOWN means the caps lock state is enabled (and the
-  // key may or may not be down, but usually isn't). There does need to
-  // to be two different flags, since the physical CapsLock key is subject
-  // to remapping, but the caps lock state (which can be triggered in a
-  // variety of ways) is not.
-  if (modifier == EVDEV_MODIFIER_CAPS_LOCK)
-    modifiers_->UpdateModifier(EVDEV_MODIFIER_MOD3, down);
+  if (IsModifierLock(modifier))
+    modifiers_->UpdateModifierLock(modifier, down);
   else
     modifiers_->UpdateModifier(modifier, down);
 }
 
 void KeyboardEvdev::UpdateKeyRepeat(unsigned int key, bool down) {
   if (!repeat_enabled_)
     StopKeyRepeat();
   else if (key != repeat_key_ && down)
     StartKeyRepeat(key);
   else if (key == repeat_key_ && !down)
@@ skipping 52 matching lines @@
     UpdateModifier(ModifierDomKeyToEventFlag(dom_key), down);
 
   KeyEvent event(down ? ET_KEY_PRESSED : ET_KEY_RELEASED, key_code, dom_code,
                  modifiers_->GetModifierFlags(), dom_key, character, timestamp);
   if (platform_keycode)
     event.set_platform_keycode(platform_keycode);
   callback_.Run(&event);
 }
 
 }  // namespace ui