Rid the world of the last of views::Event types: TouchEvent, GestureEvent, MouseWheelEvent, ScrollE…

ui/base/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 <windowsx.h>
 
 #include "ui/base/events.h"
 
 #include "base/logging.h"
 #include "base/time.h"
 #include "base/win/win_util.h"
 #include "ui/base/keycodes/keyboard_code_conversion_win.h"
 #include "ui/gfx/point.h"
 
+namespace ui {
+
 namespace {
 
 // From MSDN.
 #define MOUSEEVENTF_FROMTOUCH 0xFF515700
 
 // Get the native mouse key state from the native event message type.
 int GetNativeMouseKey(const base::NativeEvent& native_event) {
   switch (native_event.message) {
     case WM_LBUTTONDBLCLK:
     case WM_LBUTTONDOWN:
@@ skipping 56 matching lines @@
          native_event.message == WM_SYSKEYDOWN ||
          native_event.message == WM_CHAR ||
          native_event.message == WM_KEYUP ||
          native_event.message == WM_SYSKEYUP;
 }
 
 // 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 = 0;
-  flags |= base::win::IsAltPressed() ? ui::EF_ALT_DOWN : ui::EF_NONE;
-  flags |= base::win::IsShiftPressed() ? ui::EF_SHIFT_DOWN : ui::EF_NONE;
-  flags |= base::win::IsCtrlPressed() ? ui::EF_CONTROL_DOWN : ui::EF_NONE;
+  flags |= base::win::IsAltPressed() ? EF_ALT_DOWN : EF_NONE;
+  flags |= base::win::IsShiftPressed() ? EF_SHIFT_DOWN : EF_NONE;
+  flags |= base::win::IsCtrlPressed() ? EF_CONTROL_DOWN : EF_NONE;
 
   // Check key messages for the extended key flag.
   if (IsKeyEvent(native_event))
-    flags |= (HIWORD(native_event.lParam) & KF_EXTENDED) ? ui::EF_EXTENDED : 0;
+    flags |= (HIWORD(native_event.lParam) & KF_EXTENDED) ? EF_EXTENDED : 0;
 
   // 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) ? ui::EF_SHIFT_DOWN : 0;
-    flags |= (win_flags & MK_CONTROL) ? ui::EF_CONTROL_DOWN : 0;
+    flags |= (win_flags & MK_SHIFT) ? EF_SHIFT_DOWN : 0;
+    flags |= (win_flags & MK_CONTROL) ? EF_CONTROL_DOWN : 0;
   }
 
   return flags;
 }
 
 // Returns a mask corresponding to the set of pressed mouse buttons.
 // This includes the button of the given message, even if it is being released.
 int MouseStateFlagsFromNative(const base::NativeEvent& native_event) {
   // TODO(msw): ORing the pressed/released button into the flags is _wrong_.
   // It makes it impossible to tell which button was modified when multiple
   // buttons are/were held down. Instead, we need to track the modified button
   // independently and audit event consumers to do the right thing.
   int win_flags = GetNativeMouseKey(native_event);
 
   // Client mouse messages provide key states in their WPARAMs.
   if (IsClientMouseEvent(native_event))
     win_flags |= GET_KEYSTATE_WPARAM(native_event.wParam);
 
   int flags = 0;
-  flags |= (win_flags & MK_LBUTTON) ? ui::EF_LEFT_MOUSE_BUTTON : 0;
-  flags |= (win_flags & MK_MBUTTON) ? ui::EF_MIDDLE_MOUSE_BUTTON : 0;
-  flags |= (win_flags & MK_RBUTTON) ? ui::EF_RIGHT_MOUSE_BUTTON : 0;
-  flags |= IsNonClientMouseEvent(native_event) ? ui::EF_IS_NON_CLIENT : 0;
+  flags |= (win_flags & MK_LBUTTON) ? EF_LEFT_MOUSE_BUTTON : 0;
+  flags |= (win_flags & MK_MBUTTON) ? EF_MIDDLE_MOUSE_BUTTON : 0;
+  flags |= (win_flags & MK_RBUTTON) ? EF_RIGHT_MOUSE_BUTTON : 0;
+  flags |= IsNonClientMouseEvent(native_event) ? EF_IS_NON_CLIENT : 0;
   return flags;
 }
 
 }  // namespace
 
-namespace ui {
-
 void UpdateDeviceList() {
   NOTIMPLEMENTED();
 }
 
 EventType EventTypeFromNative(const base::NativeEvent& native_event) {
   switch (native_event.message) {
     case WM_KEYDOWN:
     case WM_SYSKEYDOWN:
     case WM_CHAR:
       return ET_KEY_PRESSED;
@@ skipping 154 matching lines @@
   return event.message == WM_USER + 310;
 }
 
 base::NativeEvent CreateNoopEvent() {
   MSG event = { NULL };
   event.message = WM_USER + 310;
   return event;
 }
 
 int GetModifiersFromACCEL(const ACCEL& accel) {
-  int modifiers = ui::EF_NONE;
+  int modifiers = EF_NONE;
   if (accel.fVirt & FSHIFT)
-    modifiers |= ui::EF_SHIFT_DOWN;
+    modifiers |= EF_SHIFT_DOWN;
   if (accel.fVirt & FCONTROL)
-    modifiers |= ui::EF_CONTROL_DOWN;
+    modifiers |= EF_CONTROL_DOWN;
   if (accel.fVirt & FALT)
-    modifiers |= ui::EF_ALT_DOWN;
+    modifiers |= EF_ALT_DOWN;
+  return modifiers;
+}
+
+int GetModifiersFromKeyState() {
+  int modifiers = EF_NONE;
+  if (base::win::IsShiftPressed())
+    modifiers |= EF_SHIFT_DOWN;
+  if (base::win::IsCtrlPressed())
+    modifiers |= EF_CONTROL_DOWN;
+  if (base::win::IsAltPressed())
+    modifiers |= EF_ALT_DOWN;
   return modifiers;
 }
 
 // Windows emulates mouse messages for touch events.
 bool IsMouseEventFromTouch(UINT message) {
   return (message == WM_MOUSEMOVE ||
       message == WM_LBUTTONDOWN || message == WM_LBUTTONUP ||
       message == WM_RBUTTONDOWN || message == WM_RBUTTONUP) &&
       (GetMessageExtraInfo() & MOUSEEVENTF_FROMTOUCH) ==
       MOUSEEVENTF_FROMTOUCH;
 }
 
 }  // namespace ui