Clean up event flags a bit:

ui/events/win/events_win.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 <stdint.h>
 #include <windowsx.h>
 
 #include "ui/events/event_constants.h"
 
 #include "base/logging.h"
@@ skipping 90 matching lines @@
   return native_event.message == WM_VSCROLL ||
          native_event.message == WM_HSCROLL;
 }
 
 // Returns a mask corresponding to the set of pressed modifier keys.
 // Checks the current global state and the state sent by client mouse messages.
 int KeyStateFlagsFromNative(const base::NativeEvent& native_event) {
   int flags = GetModifiersFromKeyState();
 
   // Check key messages for the extended key flag.
-  if (IsKeyEvent(native_event))
-    flags |= (HIWORD(native_event.lParam) & KF_EXTENDED) ? EF_EXTENDED : 0;
+  if (IsKeyEvent(native_event) && (HIWORD(native_event.lParam) & KF_EXTENDED))
+    flags |= EF_IS_EXTENDED_KEY;
 
   // Most client mouse messages include key state information.
   if (IsClientMouseEvent(native_event)) {
     int win_flags = GET_KEYSTATE_WPARAM(native_event.wParam);
     flags |= (win_flags & MK_SHIFT) ? EF_SHIFT_DOWN : 0;
     flags |= (win_flags & MK_CONTROL) ? EF_CONTROL_DOWN : 0;
   }
 
   return flags;
 }
@@ skipping 235 matching lines @@
 }
 
 int GetModifiersFromKeyState() {
   int modifiers = EF_NONE;
   if (ui::win::IsShiftPressed())
     modifiers |= EF_SHIFT_DOWN;
   if (ui::win::IsCtrlPressed())
     modifiers |= EF_CONTROL_DOWN;
   if (ui::win::IsAltPressed())
     modifiers |= EF_ALT_DOWN;
+  if (ui::win::IsWindowsKeyPressed())
+    modifiers |= EF_COMMAND_DOWN;
   if (ui::win::IsAltGrPressed())
     modifiers |= EF_ALTGR_DOWN;
-  if (ui::win::IsWindowsKeyPressed())
-    modifiers |= EF_COMMAND_DOWN;
+  if (ui::win::IsNumLockOn())
+    modifiers |= EF_NUM_LOCK_ON;
   if (ui::win::IsCapsLockOn())
-    modifiers |= EF_CAPS_LOCK_DOWN;
-  if (ui::win::IsNumLockOn())
-    modifiers |= EF_NUM_LOCK_DOWN;
+    modifiers |= EF_CAPS_LOCK_ON;
   if (ui::win::IsScrollLockOn())
-    modifiers |= EF_SCROLL_LOCK_DOWN;
+    modifiers |= EF_SCROLL_LOCK_ON;
   return modifiers;
 }
 
 // Windows emulates mouse messages for touch events.
 bool IsMouseEventFromTouch(UINT message) {
   return (message >= WM_MOUSEFIRST) && (message <= WM_MOUSELAST) &&
       (GetMessageExtraInfo() & MOUSEEVENTF_FROMTOUCH) ==
       MOUSEEVENTF_FROMTOUCH;
 }
 
@@ skipping 15 matching lines @@
 }
 
 LPARAM GetLParamFromScanCode(uint16_t scan_code) {
   LPARAM l_param = static_cast<LPARAM>(scan_code & 0x00FF) << 16;
   if ((scan_code & 0xE000) == 0xE000)
     l_param |= (1 << 24);
   return l_param;
 }
 
 }  // namespace ui