| Index: ash/display/mouse_cursor_event_filter.cc
|
| diff --git a/ash/display/mouse_cursor_event_filter.cc b/ash/display/mouse_cursor_event_filter.cc
|
| index 0e336d3a08cd2b9a79035781ca1d5e7fe14583e7..eb356ffa98ad84c9d127af69aba56da7113f4471 100644
|
| --- a/ash/display/mouse_cursor_event_filter.cc
|
| +++ b/ash/display/mouse_cursor_event_filter.cc
|
| @@ -71,20 +71,20 @@ void MouseCursorEventFilter::HideSharedEdgeIndicator() {
|
| shared_display_edge_indicator_->Hide();
|
| }
|
|
|
| -ui::EventResult MouseCursorEventFilter::OnMouseEvent(ui::MouseEvent* event) {
|
| +void MouseCursorEventFilter::OnMouseEvent(ui::MouseEvent* event) {
|
| // Handle both MOVED and DRAGGED events here because when the mouse pointer
|
| // enters the other root window while dragging, the underlying window system
|
| // (at least X11) stops generating a ui::ET_MOUSE_MOVED event.
|
| if (event->type() != ui::ET_MOUSE_MOVED &&
|
| event->type() != ui::ET_MOUSE_DRAGGED) {
|
| - return ui::ER_UNHANDLED;
|
| + return;
|
| }
|
|
|
| gfx::Point point_in_screen(event->location());
|
| aura::Window* target = static_cast<aura::Window*>(event->target());
|
| wm::ConvertPointToScreen(target, &point_in_screen);
|
| - return WarpMouseCursorIfNecessary(target->GetRootWindow(), point_in_screen) ?
|
| - ui::ER_CONSUMED : ui::ER_UNHANDLED;
|
| + if (WarpMouseCursorIfNecessary(target->GetRootWindow(), point_in_screen))
|
| + event->StopPropagation();
|
| }
|
|
|
| bool MouseCursorEventFilter::WarpMouseCursorIfNecessary(
|
|
|