| Index: ui/aura/mus/window_tree_client.cc
|
| diff --git a/ui/aura/mus/window_tree_client.cc b/ui/aura/mus/window_tree_client.cc
|
| index c3bdece523a654b38ceff5cfb6df6c1b0b94852b..257347304ff4537083419d4016c8a639fc719a71 100644
|
| --- a/ui/aura/mus/window_tree_client.cc
|
| +++ b/ui/aura/mus/window_tree_client.cc
|
| @@ -1242,17 +1242,20 @@ void WindowTreeClient::OnWindowInputEvent(uint32_t event_id,
|
| if (event->type() == ui::ET_POINTER_WHEEL_CHANGED) {
|
| ui::MouseWheelEvent mapped_event(*event->AsPointerEvent());
|
| DispatchEventToTarget(&mapped_event, window);
|
| + ack_handler.set_handled(mapped_event.handled());
|
| } else {
|
| ui::MouseEvent mapped_event(*event->AsPointerEvent());
|
| DispatchEventToTarget(&mapped_event, window);
|
| + ack_handler.set_handled(mapped_event.handled());
|
| }
|
| } else if (event->IsTouchPointerEvent()) {
|
| ui::TouchEvent mapped_event(*event->AsPointerEvent());
|
| DispatchEventToTarget(&mapped_event, window);
|
| + ack_handler.set_handled(mapped_event.handled());
|
| } else {
|
| DispatchEventToTarget(event.get(), window);
|
| + ack_handler.set_handled(event->handled());
|
| }
|
| - ack_handler.set_handled(event->handled());
|
| }
|
|
|
| void WindowTreeClient::OnPointerEventObserved(std::unique_ptr<ui::Event> event,
|
|
|