Clean up event flags a bit:

ui/events/blink/blink_event_util.cc

 // Copyright 2015 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.
 
 // MSVC++ requires this to be set before any other includes to get M_PI.
 #define _USE_MATH_DEFINES
 
 #include "ui/events/blink/blink_event_util.h"
 
 #include <stddef.h>
@@ skipping 207 matching lines @@
 #if defined(OS_WIN)
     // Evaluate whether OSKey should be set for other platforms.
     // Since this value was never set on Windows before as the meta
     // key; we don't break backwards compatiblity exposing it as the
     // true OS key. However this is not the case for Linux; see
     // http://crbug.com/539979
     modifiers |= blink::WebInputEvent::OSKey;
 #else
     modifiers |= blink::WebInputEvent::MetaKey;
 #endif
-
   if (flags & EF_ALTGR_DOWN)
     modifiers |= blink::WebInputEvent::AltGrKey;
+  if (flags & EF_NUM_LOCK_ON)
+    modifiers |= blink::WebInputEvent::NumLockOn;
+  if (flags & EF_CAPS_LOCK_ON)
+    modifiers |= blink::WebInputEvent::CapsLockOn;
+  if (flags & EF_SCROLL_LOCK_ON)
+    modifiers |= blink::WebInputEvent::ScrollLockOn;
   if (flags & EF_LEFT_MOUSE_BUTTON)
     modifiers |= blink::WebInputEvent::LeftButtonDown;
   if (flags & EF_MIDDLE_MOUSE_BUTTON)
     modifiers |= blink::WebInputEvent::MiddleButtonDown;
   if (flags & EF_RIGHT_MOUSE_BUTTON)
     modifiers |= blink::WebInputEvent::RightButtonDown;
-  if (flags & EF_CAPS_LOCK_DOWN)
-    modifiers |= blink::WebInputEvent::CapsLockOn;
   if (flags & EF_IS_REPEAT)
     modifiers |= blink::WebInputEvent::IsAutoRepeat;
-  if (flags & ui::EF_TOUCH_ACCESSIBILITY)
+  if (flags & EF_TOUCH_ACCESSIBILITY)
     modifiers |= blink::WebInputEvent::IsTouchAccessibility;
-  if (flags & ui::EF_NUM_LOCK_DOWN)
-    modifiers |= blink::WebInputEvent::NumLockOn;
-  if (flags & ui::EF_SCROLL_LOCK_DOWN)
-    modifiers |= blink::WebInputEvent::ScrollLockOn;
 
   return modifiers;
 }
 
 WebGestureEvent CreateWebGestureEvent(const GestureEventDetails& details,
                                       base::TimeDelta timestamp,
                                       const gfx::PointF& location,
                                       const gfx::PointF& raw_location,
                                       int flags) {
   WebGestureEvent gesture;
@@ skipping 104 matching lines @@
 }
 
 WebGestureEvent CreateWebGestureEventFromGestureEventData(
     const GestureEventData& data) {
   return CreateWebGestureEvent(data.details, data.time - base::TimeTicks(),
                                gfx::PointF(data.x, data.y),
                                gfx::PointF(data.raw_x, data.raw_y), data.flags);
 }
 
 }  // namespace ui