Clean up event flags a bit:

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 "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/keycodes/dom/dom_code.h"
 #include "ui/events/keycodes/dom/keycode_converter.h"
 #include "ui/events/ozone/evdev/event_modifiers_evdev.h"
 #include "ui/events/ozone/evdev/keyboard_util_evdev.h"
 #include "ui/events/ozone/layout/keyboard_layout_engine.h"
 #include "ui/events/ozone/layout/keyboard_layout_engine_manager.h"
 #include "ui/events/ozone/layout/layout_util.h"
 
 namespace ui {
 
 namespace {
 
 const int kRepeatDelayMs = 500;
 const int kRepeatIntervalMs = 50;
 
 int EventFlagToEvdevModifier(int flag) {
   switch (flag) {
-    case EF_CAPS_LOCK_DOWN:
-      return EVDEV_MODIFIER_CAPS_LOCK;
     case EF_SHIFT_DOWN:
       return EVDEV_MODIFIER_SHIFT;
     case EF_CONTROL_DOWN:
       return EVDEV_MODIFIER_CONTROL;
     case EF_ALT_DOWN:
       return EVDEV_MODIFIER_ALT;
+    case EF_COMMAND_DOWN:
+      return EVDEV_MODIFIER_COMMAND;
     case EF_ALTGR_DOWN:
       return EVDEV_MODIFIER_ALTGR;
     case EF_MOD3_DOWN:
       return EVDEV_MODIFIER_MOD3;
+    case EF_CAPS_LOCK_ON:
+      return EVDEV_MODIFIER_CAPS_LOCK;
     case EF_LEFT_MOUSE_BUTTON:
       return EVDEV_MODIFIER_LEFT_MOUSE_BUTTON;
     case EF_MIDDLE_MOUSE_BUTTON:
       return EVDEV_MODIFIER_MIDDLE_MOUSE_BUTTON;
     case EF_RIGHT_MOUSE_BUTTON:
       return EVDEV_MODIFIER_RIGHT_MOUSE_BUTTON;
     case EF_BACK_MOUSE_BUTTON:
       return EVDEV_MODIFIER_BACK_MOUSE_BUTTON;
     case EF_FORWARD_MOUSE_BUTTON:
       return EVDEV_MODIFIER_FORWARD_MOUSE_BUTTON;
-    case EF_COMMAND_DOWN:
-      return EVDEV_MODIFIER_COMMAND;
     default:
       return EVDEV_MODIFIER_NONE;
   }
 }
 
 }  // namespace
 
 KeyboardEvdev::KeyboardEvdev(EventModifiersEvdev* modifiers,
                              KeyboardLayoutEngine* keyboard_layout_engine,
                              const EventDispatchCallback& callback)
@@ skipping 24 matching lines @@
   key_state_.set(key, down);
   UpdateKeyRepeat(key, down, suppress_auto_repeat, device_id);
   DispatchKey(key, down, is_repeat, timestamp, device_id);
 }
 
 void KeyboardEvdev::SetCapsLockEnabled(bool enabled) {
   modifiers_->SetModifierLock(EVDEV_MODIFIER_CAPS_LOCK, enabled);
 }
 
 bool KeyboardEvdev::IsCapsLockEnabled() {
-  return (modifiers_->GetModifierFlags() & EF_CAPS_LOCK_DOWN) != 0;
+  return (modifiers_->GetModifierFlags() & EF_CAPS_LOCK_ON) != 0;
 }
 
 bool KeyboardEvdev::IsAutoRepeatEnabled() {
   return auto_repeat_enabled_;
 }
 
 void KeyboardEvdev::SetAutoRepeatEnabled(bool enabled) {
   auto_repeat_enabled_ = enabled;
 }
 
@@ skipping 18 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
+  // and EF_CAPS_LOCK_ON 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);
   else
     modifiers_->UpdateModifier(modifier, down);
 }
 
@@ skipping 92 matching lines @@
     UpdateModifier(flag, down);
   }
 
   KeyEvent event(down ? ET_KEY_PRESSED : ET_KEY_RELEASED, key_code, dom_code,
                  modifiers_->GetModifierFlags(), dom_key, timestamp);
   event.set_source_device_id(device_id);
   callback_.Run(&event);
 }
 
 }  // namespace ui