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

Unified Diff: views/mouse_watcher.cc

Issue 8378005: wayland: define base:NativeEvent for Wayland (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix per feedback. 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
« no previous file with comments | « views/focus/accelerator_handler_wayland.cc ('k') | views/widget/native_widget_wayland.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/mouse_watcher.cc
diff --git a/views/mouse_watcher.cc b/views/mouse_watcher.cc
index 02e1cc07a81de9a6175dea94daa3731f7205c735..b88e85fea37dd4ab1ca450630d93a5ae706b83fd 100644
--- a/views/mouse_watcher.cc
+++ b/views/mouse_watcher.cc
@@ -6,6 +6,7 @@
#include "base/bind.h"
#include "base/compiler_specific.h"
+#include "base/event_types.h"
#include "base/memory/weak_ptr.h"
#include "base/message_loop.h"
#include "ui/base/events.h"
@@ -13,10 +14,6 @@
#include "views/view.h"
#include "views/widget/widget.h"
-#if defined(USE_WAYLAND)
-#include "ui/wayland/events/wayland_event.h"
-#endif
-
namespace views {
// Amount of time between when the mouse moves outside the view's zone and when
@@ -66,12 +63,12 @@ class MouseWatcher::Observer : public MessageLoopForUI::Observer {
}
#elif defined(USE_WAYLAND)
virtual MessageLoopForUI::Observer::EventStatus WillProcessEvent(
- ui::WaylandEvent* event) OVERRIDE {
+ base::wayland::WaylandEvent* event) OVERRIDE {
switch (event->type) {
- case ui::WAYLAND_MOTION:
+ case base::wayland::WAYLAND_MOTION:
HandleGlobalMouseMoveEvent(false);
break;
- case ui::WAYLAND_POINTER_FOCUS:
+ case base::wayland::WAYLAND_POINTER_FOCUS:
if (!event->pointer_focus.state)
HandleGlobalMouseMoveEvent(true);
break;
« no previous file with comments | « views/focus/accelerator_handler_wayland.cc ('k') | views/widget/native_widget_wayland.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698