wayland: define base:NativeEvent for Wayland

views/widget/native_widget_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 "views/widget/native_widget_wayland.h"
 
 #include <cairo.h>
 #include <cairo-gl.h>
 #include <EGL/egl.h>
 #include <GL/gl.h>
 #include <wayland-egl.h>
 
 #include <algorithm>
 #include <list>
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/wayland/wayland_event.h"
 #include "ui/base/view_prop.h"
 #include "ui/gfx/canvas_skia_paint.h"
 #include "ui/gfx/compositor/compositor.h"
 #include "ui/gfx/gl/gl_surface.h"
 #include "ui/gfx/gl/gl_surface_egl.h"
-#include "ui/wayland/events/wayland_event.h"
 #include "ui/wayland/wayland_display.h"
 #include "ui/wayland/wayland_input_device.h"
 #include "ui/wayland/wayland_screen.h"
 #include "ui/wayland/wayland_window.h"
 #include "views/ime/input_method_wayland.h"
 #include "views/views_delegate.h"
 #include "views/widget/native_widget_views.h"
 #include "views/widget/root_view.h"
 #include "views/widget/tooltip_manager_views.h"
 
 using ui::ViewProp;
 
+using base::wayland::WaylandEvent;
+
 namespace views {
 
 namespace {
 
 // Links the WaylandWidget to its NativeWidget.
 const char* const kNativeWidgetKey = "__VIEWS_NATIVE_WIDGET__";
 
 }  // namespace
 
 NativeWidgetWayland::NativeWidgetWayland(
@@ skipping 496 matching lines @@
     }
 
     // Have cairo swap buffers, then let Wayland know of the damaged area.
     cairo_gl_surface_swapbuffers(cairo_surface_);
     wl_surface_damage(wayland_window_->surface(),
                       damage_area.x(), damage_area.y(),
                       damage_area.width(), damage_area.height());
   }
 }
 
-void NativeWidgetWayland::OnMotionNotify(ui::WaylandEvent event) {
+void NativeWidgetWayland::OnMotionNotify(WaylandEvent event) {
   MouseEvent mouse_event(&event);
   delegate_->OnMouseEvent(mouse_event);
 }
 
-void NativeWidgetWayland::OnButtonNotify(ui::WaylandEvent event) {
+void NativeWidgetWayland::OnButtonNotify(WaylandEvent event) {
   if (event.button.button == ui::SCROLL_UP ||
       event.button.button == ui::SCROLL_DOWN) {
     MouseWheelEvent mouse_event(&event);
     delegate_->OnMouseEvent(mouse_event);
   } else {
     MouseEvent mouse_event(&event);
     delegate_->OnMouseEvent(mouse_event);
   }
 }
 
-void NativeWidgetWayland::OnKeyNotify(ui::WaylandEvent event) {
+void NativeWidgetWayland::OnKeyNotify(WaylandEvent event) {
   KeyEvent key_event(&event);
   InputMethod* input_method = GetWidget()->GetInputMethodDirect();
   if (input_method)
     input_method->DispatchKeyEvent(key_event);
   else
     DispatchKeyEventPostIME(key_event);
 }
 
-void NativeWidgetWayland::OnPointerFocus(ui::WaylandEvent event) {
+void NativeWidgetWayland::OnPointerFocus(WaylandEvent event) {
   MouseEvent mouse_event(&event);
   delegate_->OnMouseEvent(mouse_event);
 }
 
-void NativeWidgetWayland::OnKeyboardFocus(ui::WaylandEvent event) {
+void NativeWidgetWayland::OnKeyboardFocus(WaylandEvent event) {
   InputMethod* input_method = GetWidget()->GetInputMethodDirect();
   if (input_method) {
     if (event.keyboard_focus.state)
       input_method->OnFocus();
     else
       input_method->OnBlur();
   }
 }
 
-void NativeWidgetWayland::OnGeometryChange(ui::WaylandEvent event) {
+void NativeWidgetWayland::OnGeometryChange(WaylandEvent event) {
   SetSize(gfx::Size(event.geometry_change.width,
                     event.geometry_change.height));
 }
 
 /////////////////////////////////////////////////////////////////////////////
 // Widget
 
 // static
 bool Widget::ConvertRect(const Widget* source,
                          const Widget* target,
@@ skipping 69 matching lines @@
 
 // static
 bool NativeWidgetPrivate::IsMouseButtonDown() {
   NOTIMPLEMENTED();
   return false;
 }
 
 }  // namespace internal
 
 }  // namespace views