| 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;
|
|
|