NOSUBMIT: PointerWatcher observes all pointer events, with moves optional

ash/shelf/shelf_tooltip_manager.h

Index: ash/shelf/shelf_tooltip_manager.h
diff --git a/ash/shelf/shelf_tooltip_manager.h b/ash/shelf/shelf_tooltip_manager.h
index cccd7d3615fea46836156826ded5d2a4f935b027..5c7ad62790187962d04b62087459db3b757f0a34 100644
--- a/ash/shelf/shelf_tooltip_manager.h
+++ b/ash/shelf/shelf_tooltip_manager.h
@@ -64,12 +64,9 @@ class ASH_EXPORT ShelfTooltipManager : public ui::EventHandler,
   void OnWindowDestroying(aura::Window* window) override;
 
   // views::PointerWatcher overrides:
-  void OnMousePressed(const ui::MouseEvent& event,
-                      const gfx::Point& location_in_screen,
-                      views::Widget* target) override;
-  void OnTouchPressed(const ui::TouchEvent& event,
-                      const gfx::Point& location_in_screen,
-                      views::Widget* target) override;
+  void OnPointerEventObserved(const ui::LocatedEvent& event,
+                              const gfx::Point& location_in_screen,
+                              views::Widget* target) override;
 
   // ShelfLayoutManagerObserver overrides:
   void WillDeleteShelfLayoutManager() override;