Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(55)

Unified Diff: views/widget/native_widget_wayland.h

Issue 8378005: wayland: define base:NativeEvent for Wayland (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Create a new wayland namespace in base and define WaylandEvent there. Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: views/widget/native_widget_wayland.h
diff --git a/views/widget/native_widget_wayland.h b/views/widget/native_widget_wayland.h
index 8431588335a10f833b63a167943c2b945a4be78b..fa88a7e815cad0c657010ea3d8d5e7130e76db93 100644
--- a/views/widget/native_widget_wayland.h
+++ b/views/widget/native_widget_wayland.h
@@ -10,6 +10,7 @@
#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"
@@ -21,6 +22,8 @@
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;
}
@@ -127,13 +130,13 @@ class NativeWidgetWayland : public internal::NativeWidgetPrivate,
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;

Powered by Google App Engine
This is Rietveld 408576698