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) {

[msw, 2011/10/04 18:10:37]

I don't know what this will do in a Wayland build if there is no WaylandEvent
NativeEvent...

   // 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) {

[msw, 2011/10/04 18:10:37]

How is this (and the functions below) building if there is no NativeEvent type
defined in namespace ui? (also these functions expect WaylandEvent...)

   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 56 matching lines @@
          native_event->type == WAYLAND_MOTION ||
          native_event->type == WAYLAND_POINTER_FOCUS;
 }
 
 int GetMouseWheelOffset(const NativeEvent& native_event) {
   return native_event->button.button == ui::SCROLL_UP ?
       kWheelScrollAmount : -kWheelScrollAmount;
 }
 
 }  // namespace ui