Clean up event flags a bit:

ui/events/x/events_x.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 "ui/events/event_constants.h"
 
 #include <stddef.h>
 #include <string.h>
 #include <X11/extensions/XInput.h>
 #include <X11/extensions/XInput2.h>
@@ skipping 126 matching lines @@
   if (!ui::DeviceDataManagerX11::GetInstance()->GetDataRange(
       deviceid, ui::DeviceDataManagerX11::DT_TOUCH_MAJOR, &min, &max)) {
     return false;
   }
 
   return radius * 2 == max;
 }
 
 int GetEventFlagsFromXState(unsigned int state) {
   int flags = 0;
+  if (state & ShiftMask)
+    flags |= ui::EF_SHIFT_DOWN;
+  if (state & LockMask)
+    flags |= ui::EF_CAPS_LOCK_ON;
   if (state & ControlMask)
     flags |= ui::EF_CONTROL_DOWN;
-  if (state & ShiftMask)
-    flags |= ui::EF_SHIFT_DOWN;
   if (state & Mod1Mask)
     flags |= ui::EF_ALT_DOWN;
-  if (state & LockMask)
-    flags |= ui::EF_CAPS_LOCK_DOWN;
   if (state & Mod2Mask)
-    flags |= ui::EF_NUM_LOCK_DOWN;
+    flags |= ui::EF_NUM_LOCK_ON;
   if (state & Mod3Mask)
     flags |= ui::EF_MOD3_DOWN;
   if (state & Mod4Mask)
     flags |= ui::EF_COMMAND_DOWN;
   if (state & Mod5Mask)
     flags |= ui::EF_ALTGR_DOWN;
   if (state & Button1Mask)
     flags |= ui::EF_LEFT_MOUSE_BUTTON;
   if (state & Button2Mask)
     flags |= ui::EF_MIDDLE_MOUSE_BUTTON;
@@ skipping 125 matching lines @@
   XIDeviceEvent* xiev = static_cast<XIDeviceEvent*>(xev->xcookie.data);
   ui::DeviceDataManagerX11::GetInstance()->ApplyTouchRadiusScale(
       xiev->sourceid, radius);
 }
 
 unsigned int UpdateX11EventFlags(int ui_flags, unsigned int old_x_flags) {
   static struct {
     int ui;
     int x;
   } flags[] = {
+    {ui::EF_SHIFT_DOWN, ShiftMask},
+    {ui::EF_CAPS_LOCK_ON, LockMask},
     {ui::EF_CONTROL_DOWN, ControlMask},
-    {ui::EF_SHIFT_DOWN, ShiftMask},
     {ui::EF_ALT_DOWN, Mod1Mask},
-    {ui::EF_CAPS_LOCK_DOWN, LockMask},
+    {ui::EF_NUM_LOCK_ON, Mod2Mask},
+    {ui::EF_MOD3_DOWN, Mod3Mask},
+    {ui::EF_COMMAND_DOWN, Mod4Mask},
     {ui::EF_ALTGR_DOWN, Mod5Mask},
-    {ui::EF_COMMAND_DOWN, Mod4Mask},
-    {ui::EF_MOD3_DOWN, Mod3Mask},
     {ui::EF_LEFT_MOUSE_BUTTON, Button1Mask},
     {ui::EF_MIDDLE_MOUSE_BUTTON, Button2Mask},
     {ui::EF_RIGHT_MOUSE_BUTTON, Button3Mask},
   };
   unsigned int new_x_flags = old_x_flags;
   for (size_t i = 0; i < arraysize(flags); ++i) {
     if (ui_flags & flags[i].ui)
       new_x_flags |= flags[i].x;
     else
       new_x_flags &= ~flags[i].x;
@@ skipping 564 matching lines @@
       xievent->detail =
           UpdateX11EventButton(event->changed_button_flags(), xievent->detail);
       break;
     }
     default:
       break;
   }
 }
 
 }  // namespace ui