Index: ash/pointer_watcher_delegate_aura.cc |
diff --git a/ash/pointer_watcher_delegate_aura.cc b/ash/pointer_watcher_delegate_aura.cc |
index 541a2b5643c1d25ef057667b50c2ce1cc5648b45..3faff481e393113cf9f8d76c6f4394f1f3edf0cd 100644 |
--- a/ash/pointer_watcher_delegate_aura.cc |
+++ b/ash/pointer_watcher_delegate_aura.cc |
@@ -44,18 +44,12 @@ void PointerWatcherDelegateAura::RemovePointerWatcher( |
} |
void PointerWatcherDelegateAura::OnMouseEvent(ui::MouseEvent* event) { |
- if (event->type() == ui::ET_MOUSE_CAPTURE_CHANGED) { |
- FOR_EACH_OBSERVER(views::PointerWatcher, non_move_watchers_, |
- OnMouseCaptureChanged()); |
- FOR_EACH_OBSERVER(views::PointerWatcher, move_watchers_, |
- OnMouseCaptureChanged()); |
- return; |
- } |
- |
// For compatibility with the mus version, don't send drags. |
if (event->type() != ui::ET_MOUSE_PRESSED && |
event->type() != ui::ET_MOUSE_RELEASED && |
- event->type() != ui::ET_MOUSE_MOVED) |
+ event->type() != ui::ET_MOUSE_MOVED && |
+ event->type() != ui::ET_MOUSEWHEEL && |
+ event->type() != ui::ET_MOUSE_CAPTURE_CHANGED) |
return; |
DCHECK(ui::PointerEvent::CanConvertFrom(*event)); |