wayland: define base:NativeEvent for Wayland

views/widget/native_widget_wayland.h

 // 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.
 
 #ifndef VIEWS_WIDGET_NATIVE_WIDGET_WAYLAND_H_
 #define VIEWS_WIDGET_NATIVE_WIDGET_WAYLAND_H_
 #pragma once
 
 #include <wayland-client.h>
 
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
+#include "base/wayland/wayland_event.h"
 #include "ui/gfx/compositor/compositor.h"
 #include "ui/gfx/gl/gl_context.h"
 #include "ui/gfx/gl/gl_surface.h"
 #include "ui/gfx/size.h"
 #include "ui/wayland/wayland_widget.h"
 #include "views/widget/native_widget_private.h"
 #include "views/widget/widget.h"
 
 typedef struct _cairo_device cairo_device_t;
 typedef struct _cairo_surface cairo_surface_t;
 
+using base::wayland::WaylandEvent;

[sky, 2011/11/10 00:52:42]

no using in headers.

[Mandeep Singh Baines, 2011/11/11 19:26:52]

Done.

+
 namespace gfx {
 class Rect;
 }
 
 namespace ui {
 class ViewProp;
 class WaylandDisplay;
 class WaylandInputDevice;
 class WaylandWindow;
 }
@@ skipping 86 matching lines @@
   virtual void RunShellDrag(View* view,
                             const ui::OSExchangeData& data,
                             int operation) OVERRIDE;
   virtual void SchedulePaintInRect(const gfx::Rect& rect) OVERRIDE;
   virtual void SetCursor(gfx::NativeCursor cursor) OVERRIDE;
   virtual void ClearNativeFocus() OVERRIDE;
   virtual void FocusNativeView(gfx::NativeView native_view) OVERRIDE;
   virtual bool ConvertPointFromAncestor(
       const Widget* ancestor, gfx::Point* point) const OVERRIDE;
 
-  virtual void OnMotionNotify(ui::WaylandEvent event) OVERRIDE;
-  virtual void OnButtonNotify(ui::WaylandEvent event) OVERRIDE;
-  virtual void OnKeyNotify(ui::WaylandEvent event) OVERRIDE;
-  virtual void OnPointerFocus(ui::WaylandEvent event) OVERRIDE;
-  virtual void OnKeyboardFocus(ui::WaylandEvent event) OVERRIDE;
+  virtual void OnMotionNotify(WaylandEvent event) OVERRIDE;
+  virtual void OnButtonNotify(WaylandEvent event) OVERRIDE;
+  virtual void OnKeyNotify(WaylandEvent event) OVERRIDE;
+  virtual void OnPointerFocus(WaylandEvent event) OVERRIDE;
+  virtual void OnKeyboardFocus(WaylandEvent event) OVERRIDE;
 
-  virtual void OnGeometryChange(ui::WaylandEvent event) OVERRIDE;
+  virtual void OnGeometryChange(WaylandEvent event) OVERRIDE;
 
  private:
   typedef ScopedVector<ui::ViewProp> ViewProps;
 
   // Overridden from ui::CompositorDelegate
   virtual void ScheduleDraw();
 
   // Overridden from NativeWidget
   virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE;
 
@@ skipping 54 matching lines @@
   // and the compositor will have these, so we don't need to worry about them.
   scoped_refptr<gfx::GLSurface> surface_;
   scoped_refptr<gfx::GLContext> context_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeWidgetWayland);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_WIDGET_NATIVE_WIDGET_WAYLAND_H_