Index: base/wayland/wayland_event.h |
diff --git a/ui/wayland/events/wayland_event.h b/base/wayland/wayland_event.h |
similarity index 84% |
rename from ui/wayland/events/wayland_event.h |
rename to base/wayland/wayland_event.h |
index 0c203619745a4f7791952b166b8d79617db618f0..1d6808de25cca0f014219bfb098bfc72d7f698bd 100644 |
--- a/ui/wayland/events/wayland_event.h |
+++ b/base/wayland/wayland_event.h |
@@ -2,10 +2,9 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef UI_WAYLAND_EVENTS_WAYLAND_EVENT_H_ |
-#define UI_WAYLAND_EVENTS_WAYLAND_EVENT_H_ |
+#ifndef BASE_WAYLAND_WAYLAND_EVENT_H_ |
+#define BASE_WAYLAND_WAYLAND_EVENT_H_ |
-#include <linux/input.h> |
#include <stdint.h> |
// Wayland event information is being passed in as arguments to the callbacks. |
@@ -26,7 +25,8 @@ |
// Stores all the keyboard modifiers (Ctrl, Alt, Shift, ...) currently |
// active. The modifiers are values as defined by xkbcommon. |
-namespace ui { |
+namespace base { |
+namespace wayland { |
// Types of events Wayland will send |
enum WaylandEventType { |
@@ -38,17 +38,6 @@ enum WaylandEventType { |
WAYLAND_GEOMETRY_CHANGE, |
}; |
-// These are the mouse events expected. The event type Wayland sends is an |
-// evdev event. The following is the correct mapping from evdev to expected |
-// events type. |
-enum WaylandEventButtonType { |
- LEFT_BUTTON = BTN_LEFT, |
- MIDDLE_BUTTON = BTN_RIGHT, |
- RIGHT_BUTTON = BTN_MIDDLE, |
- SCROLL_UP = BTN_SIDE, |
- SCROLL_DOWN = BTN_EXTRA, |
-}; |
- |
struct WaylandEventButton { |
WaylandEventType type; |
uint32_t time; |
@@ -122,6 +111,7 @@ union WaylandEvent { |
WaylandEventGeometryChange geometry_change; |
}; |
-} // namespace ui |
+} // namespace wayland |
+} // namespace base |
-#endif // UI_WAYLAND_EVENTS_WAYLAND_EVENT_H_ |
+#endif // BASE_WAYLAND_WAYLAND_EVENT_H_ |