NOSUBMIT: PointerWatcher observes all pointer events, with moves optional

ash/pointer_watcher_delegate_aura.cc

Index: ash/pointer_watcher_delegate_aura.cc
diff --git a/ash/pointer_watcher_delegate_aura.cc b/ash/pointer_watcher_delegate_aura.cc
index d70720d5a1932395559a707fb2e3defc33ac896f..4190ee0fe29325a23ced8beea1839d92d2ac2dbf 100644
--- a/ash/pointer_watcher_delegate_aura.cc
+++ b/ash/pointer_watcher_delegate_aura.cc
@@ -34,17 +34,21 @@ void PointerWatcherDelegateAura::RemovePointerWatcher(
 }
 
 void PointerWatcherDelegateAura::OnMouseEvent(ui::MouseEvent* event) {
-  if (event->type() == ui::ET_MOUSE_PRESSED)
-    FOR_EACH_OBSERVER(views::PointerWatcher, pointer_watchers_,
-                      OnMousePressed(*event, GetLocationInScreen(*event),
-                                     GetTargetWidget(*event)));
+  // For compatibility with the mus version, don't send moves.
+  if (event->type() == ui::ET_MOUSE_MOVED)
+    return;
+  FOR_EACH_OBSERVER(views::PointerWatcher, pointer_watchers_,
+                    OnPointerEventObserved(*event, GetLocationInScreen(*event),
+                                           GetTargetWidget(*event)));
 }
 
 void PointerWatcherDelegateAura::OnTouchEvent(ui::TouchEvent* event) {
-  if (event->type() == ui::ET_TOUCH_PRESSED)
-    FOR_EACH_OBSERVER(views::PointerWatcher, pointer_watchers_,
-                      OnTouchPressed(*event, GetLocationInScreen(*event),
-                                     GetTargetWidget(*event)));
+  // For compatibility with the mus version, don't send moves.
+  if (event->type() == ui::ET_TOUCH_MOVED)
+    return;
+  FOR_EACH_OBSERVER(views::PointerWatcher, pointer_watchers_,
+                    OnPointerEventObserved(*event, GetLocationInScreen(*event),
+                                           GetTargetWidget(*event)));
 }
 
 gfx::Point PointerWatcherDelegateAura::GetLocationInScreen(