NOSUBMIT: PointerWatcher observes all pointer events, with moves optional

ash/touch_hud/mus/touch_hud_application.cc

Index: ash/touch_hud/mus/touch_hud_application.cc
diff --git a/ash/touch_hud/mus/touch_hud_application.cc b/ash/touch_hud/mus/touch_hud_application.cc
index 6339b46386e45ebcddb2fb202407cdbba6e9fd30..00fed14fd017b12556cd7a7ca3c5f9cbf81daa4c 100644
--- a/ash/touch_hud/mus/touch_hud_application.cc
+++ b/ash/touch_hud/mus/touch_hud_application.cc
@@ -14,7 +14,7 @@
 #include "ui/views/mus/aura_init.h"
 #include "ui/views/mus/native_widget_mus.h"
 #include "ui/views/mus/window_manager_connection.h"
-#include "ui/views/touch_event_watcher.h"
+#include "ui/views/pointer_watcher.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
@@ -25,16 +25,16 @@ namespace touch_hud {
 // receiving touch events from ui::WindowManagerConnection, it calls
 // ash::TouchHudRenderer to draw out touch points.
 class TouchHudUI : public views::WidgetDelegateView,
-                   public views::TouchEventWatcher {
+                   public views::PointerWatcher {
  public:
   TouchHudUI(views::WindowManagerConnection* window_manager_connection,
              views::Widget* widget)
       : window_manager_connection_(window_manager_connection),
         touch_hud_renderer_(new TouchHudRenderer(widget)) {
-    window_manager_connection_->AddTouchEventWatcher(this);
+    window_manager_connection_->AddPointerWatcher(this, true /* want_moves */);
   }
   ~TouchHudUI() override {
-    window_manager_connection_->RemoveTouchEventWatcher(this);
+    window_manager_connection_->RemovePointerWatcher(this);
   }
 
  private:
@@ -45,10 +45,12 @@ class TouchHudUI : public views::WidgetDelegateView,
     return base::ASCIIToUTF16("TouchHud");
   }
 
-  // Overridden from views::TouchEventWatcher:
-  void OnTouchEventObserved(const ui::LocatedEvent& event,
-                            views::Widget* target) override {
-    touch_hud_renderer_->HandleTouchEvent(event);
+  // Overridden from views::PointerWatcher:
+  void OnPointerEventObserved(const ui::LocatedEvent& event,
+                              const gfx::Point& location_in_screen,
+                              views::Widget* target) override {
+    if (event.IsTouchEvent() || event.IsTouchPointerEvent())
+      touch_hud_renderer_->HandleTouchEvent(event);
   }
 
   views::WindowManagerConnection* window_manager_connection_;