Index: components/mus/ws/window_tree_host_impl.cc |
diff --git a/components/mus/ws/window_tree_host_impl.cc b/components/mus/ws/window_tree_host_impl.cc |
index 7478ab3e34cd2cdef4fcfb1331a6cf5f2e7f305d..e2abae907704af7dceb4169803b51d188b7e8c95 100644 |
--- a/components/mus/ws/window_tree_host_impl.cc |
+++ b/components/mus/ws/window_tree_host_impl.cc |
@@ -33,7 +33,7 @@ bool EventsCanBeCoalesced(const mojom::Event& one, const mojom::Event& two) { |
if (one.action != two.action || one.flags != two.flags) |
return false; |
// TODO(sad): wheel events can also be merged. |
- if (one.action != mojom::EVENT_TYPE_POINTER_MOVE) |
+ if (one.action != mojom::EventType::POINTER_MOVE) |
return false; |
DCHECK(one.pointer_data); |
DCHECK(two.pointer_data); |
@@ -45,7 +45,7 @@ bool EventsCanBeCoalesced(const mojom::Event& one, const mojom::Event& two) { |
} |
mojom::EventPtr CoalesceEvents(mojom::EventPtr first, mojom::EventPtr second) { |
- DCHECK_EQ(first->action, mojom::EVENT_TYPE_POINTER_MOVE) |
+ DCHECK_EQ(first->action, mojom::EventType::POINTER_MOVE) |
<< " Non-move events cannot be merged yet."; |
// For mouse moves, the new event just replaces the old event. |
return second; |
@@ -426,7 +426,7 @@ void WindowTreeHostImpl::DispatchInputEventToWindow(ServerWindow* target, |
DCHECK(!event_ack_timer_.IsRunning()); |
if (event->pointer_data && |
- event->pointer_data->kind == mojom::PointerKind::POINTER_KIND_MOUSE) { |
+ event->pointer_data->kind == mojom::PointerKind::MOUSE) { |
DCHECK(event_dispatcher_.mouse_cursor_source_window()); |
UpdateNativeCursor( |
event_dispatcher_.mouse_cursor_source_window()->cursor()); |