Consolidate ui::NativeEvent and base::NativeEvent

ui/base/wayland/events_wayland.cc

 // Copyright (c) 2011 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/base/events.h"
 
 #include <X11/extensions/XInput2.h>
 
 #include "base/logging.h"
 #include "ui/base/keycodes/keyboard_code_conversion_x.h"
@@ skipping 18 matching lines @@
   if (state & Button1Mask)
     flags |= ui::EF_LEFT_BUTTON_DOWN;
   if (state & Button2Mask)
     flags |= ui::EF_MIDDLE_BUTTON_DOWN;
   if (state & Button3Mask)
     flags |= ui::EF_RIGHT_BUTTON_DOWN;
 
   return flags;
 }
 
-int GetButtonEventFlagsFromNativeEvent(const ui::NativeEvent& native_event) {
+int GetButtonEventFlagsFromNativeEvent(const base::NativeEvent& native_event) {
   // TODO(dnicoara): Need to add double click.
   int flags = 0;
   switch (native_event->button.button) {
     case ui::LEFT_BUTTON:
       return flags | ui::EF_LEFT_BUTTON_DOWN;
     case ui::MIDDLE_BUTTON:
       return flags | ui::EF_MIDDLE_BUTTON_DOWN;
     case ui::RIGHT_BUTTON:
       return flags | ui::EF_RIGHT_BUTTON_DOWN;
   }
   return flags;
 }
 
 }  // namespace
 
 namespace ui {
 
-EventType EventTypeFromNative(const NativeEvent& native_event) {
+EventType EventTypeFromNative(const base::NativeEvent& native_event) {
   switch (native_event->type) {
     case WAYLAND_BUTTON:
       switch (native_event->button.button) {
         case LEFT_BUTTON:
         case RIGHT_BUTTON:
         case MIDDLE_BUTTON:
           return native_event->button.state ? ET_MOUSE_PRESSED
                                             : ET_MOUSE_RELEASED;
         case SCROLL_UP:
         case SCROLL_DOWN:
@@ skipping 10 matching lines @@
       return native_event->pointer_focus.state ? ET_MOUSE_ENTERED
                                                : ET_MOUSE_EXITED;
     case WAYLAND_KEYBOARD_FOCUS:
       return ET_UNKNOWN;
     default:
       break;
   }
   return ET_UNKNOWN;
 }
 
-int EventFlagsFromNative(const NativeEvent& native_event) {
+int EventFlagsFromNative(const base::NativeEvent& native_event) {
   switch (native_event->type) {
     case WAYLAND_BUTTON:
       return GetButtonEventFlagsFromNativeEvent(native_event) |
              GetEventFlagsFromState(native_event->button.modifiers);
     case WAYLAND_KEY:
       return GetEventFlagsFromState(native_event->key.modifiers);
     case WAYLAND_MOTION:
       return GetEventFlagsFromState(native_event->motion.modifiers);
     case WAYLAND_KEYBOARD_FOCUS:
       return GetEventFlagsFromState(native_event->keyboard_focus.modifiers);
     default:
       return 0;
   }
 }
 
-gfx::Point EventLocationFromNative(const NativeEvent& native_event) {
+gfx::Point EventLocationFromNative(const base::NativeEvent& native_event) {
   switch (native_event->type) {
     case WAYLAND_BUTTON:
       return gfx::Point(native_event->button.x, native_event->button.y);
     case WAYLAND_MOTION:
       return gfx::Point(native_event->motion.x, native_event->motion.y);
     case WAYLAND_POINTER_FOCUS:
       return gfx::Point(native_event->pointer_focus.x,
                         native_event->pointer_focus.y);
     default:
       return gfx::Point();
   }
 }
 
-KeyboardCode KeyboardCodeFromNative(const NativeEvent& native_event) {
+KeyboardCode KeyboardCodeFromNative(const base::NativeEvent& native_event) {
   return KeyboardCodeFromXKeysym(native_event->key.sym);
 }
 
-bool IsMouseEvent(const NativeEvent& native_event) {
+bool IsMouseEvent(const base::NativeEvent& native_event) {
   return native_event->type == WAYLAND_BUTTON ||
          native_event->type == WAYLAND_MOTION ||
          native_event->type == WAYLAND_POINTER_FOCUS;
 }
 
-int GetMouseWheelOffset(const NativeEvent& native_event) {
+int GetMouseWheelOffset(const base::NativeEvent& native_event) {
   return native_event->button.button == ui::SCROLL_UP ?
       kWheelScrollAmount : -kWheelScrollAmount;
 }
 
 }  // namespace ui