NOSUBMIT: PointerWatcher observes all pointer events, with moves optional

ash/shelf/shelf_tooltip_manager.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ASH_SHELF_SHELF_TOOLTIP_MANAGER_H_
 #define ASH_SHELF_SHELF_TOOLTIP_MANAGER_H_
 
 #include "ash/ash_export.h"
 #include "ash/shelf/shelf_layout_manager_observer.h"
 #include "base/macros.h"
@@ skipping 46 matching lines @@
   void set_timer_delay_for_test(int timer_delay) { timer_delay_ = timer_delay; }
 
  protected:
   // ui::EventHandler overrides:
   void OnEvent(ui::Event* event) override;
 
   // aura::WindowObserver overrides:
   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;
   void WillChangeVisibilityState(ShelfVisibilityState new_state) override;
   void OnAutoHideStateChanged(ShelfAutoHideState new_state) override;
 
  private:
   class ShelfTooltipBubble;
   friend class test::ShelfViewTest;
   friend class test::ShelfTooltipManagerTest;
@@ skipping 10 matching lines @@
   views::BubbleDialogDelegateView* bubble_;
 
   base::WeakPtrFactory<ShelfTooltipManager> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfTooltipManager);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELF_SHELF_TOOLTIP_MANAGER_H_