Index: ui/events/event.cc |
diff --git a/ui/events/event.cc b/ui/events/event.cc |
index eff99926a21b3d44e1d31a6f1d1e30d897f6e899..8b89cee2e7f1ba25effd24d07c6cf51a78e21620 100644 |
--- a/ui/events/event.cc |
+++ b/ui/events/event.cc |
@@ -104,6 +104,8 @@ std::string EventTypeName(ui::EventType type) { |
CASE_TYPE(ET_POINTER_CANCELLED); |
CASE_TYPE(ET_POINTER_ENTERED); |
CASE_TYPE(ET_POINTER_EXITED); |
+ CASE_TYPE(ET_POINTER_WHEEL_CHANGED); |
+ CASE_TYPE(ET_POINTER_CAPTURE_CHANGED); |
CASE_TYPE(ET_GESTURE_SCROLL_BEGIN); |
CASE_TYPE(ET_GESTURE_SCROLL_END); |
CASE_TYPE(ET_GESTURE_SCROLL_UPDATE); |
@@ -496,6 +498,14 @@ MouseEvent::MouseEvent(const PointerEvent& pointer_event) |
SetType(ET_MOUSE_RELEASED); |
break; |
+ case ET_POINTER_WHEEL_CHANGED: |
+ SetType(ET_MOUSEWHEEL); |
+ break; |
+ |
+ case ET_POINTER_CAPTURE_CHANGED: |
+ SetType(ET_MOUSE_CAPTURE_CHANGED); |
+ break; |
+ |
default: |
NOTREACHED(); |
} |
@@ -847,6 +857,8 @@ bool PointerEvent::CanConvertFrom(const Event& event) { |
case ET_MOUSE_ENTERED: |
case ET_MOUSE_EXITED: |
case ET_MOUSE_RELEASED: |
+ case ET_MOUSEWHEEL: |
+ case ET_MOUSE_CAPTURE_CHANGED: |
case ET_TOUCH_PRESSED: |
case ET_TOUCH_MOVED: |
case ET_TOUCH_RELEASED: |
@@ -889,6 +901,17 @@ PointerEvent::PointerEvent(const MouseEvent& mouse_event) |
SetType(ET_POINTER_UP); |
break; |
+ case ET_MOUSEWHEEL: |
+ SetType(ET_POINTER_WHEEL_CHANGED); |
+ details_ = PointerDetails(EventPointerType::POINTER_TYPE_MOUSE, |
+ mouse_event.AsMouseWheelEvent()->x_offset(), |
+ mouse_event.AsMouseWheelEvent()->y_offset()); |
+ break; |
+ |
+ case ET_MOUSE_CAPTURE_CHANGED: |
+ SetType(ET_POINTER_CAPTURE_CHANGED); |
+ break; |
+ |
default: |
NOTREACHED(); |
} |