mus: Change PointerWatcher to observe all pointer events, with moves optional.

ash/common/shelf/shelf_tooltip_manager.cc

 // 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.
 
 #include "ash/common/shelf/shelf_tooltip_manager.h"
 
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm_lookup.h"
 #include "ash/common/wm_root_window_controller.h"
@@ skipping 180 matching lines @@
 }
 
 void ShelfTooltipManager::ShowTooltipWithDelay(views::View* view) {
   if (ShouldShowTooltipForView(view)) {
     timer_.Start(FROM_HERE, base::TimeDelta::FromMilliseconds(timer_delay_),
                  base::Bind(&ShelfTooltipManager::ShowTooltip,
                             weak_factory_.GetWeakPtr(), view));
   }
 }
 
-void ShelfTooltipManager::OnMousePressed(const ui::MouseEvent& event,
-                                         const gfx::Point& location_in_screen,
-                                         views::Widget* target) {
-  // Close on any mouse press events inside or outside the tooltip.
-  Close();
-}
-
-void ShelfTooltipManager::OnTouchPressed(const ui::TouchEvent& event,
-                                         const gfx::Point& location_in_screen,
-                                         views::Widget* target) {
-  // Close on any touch press events inside or outside the tooltip.
-  Close();
+void ShelfTooltipManager::OnPointerWatcherEvent(
+    const ui::PointerEvent& event,
+    const gfx::Point& location_in_screen,
+    views::Widget* target) {
+  // Close on any press events inside or outside the tooltip.
+  if (event.type() == ui::ET_POINTER_DOWN)
+    Close();
 }
 
 void ShelfTooltipManager::OnMouseEvent(ui::MouseEvent* event) {
   if (event->type() == ui::ET_MOUSE_EXITED) {
     Close();
     return;
   }
 
   if (event->type() != ui::ET_MOUSE_MOVED)
     return;
@@ skipping 29 matching lines @@
         base::Bind(&ShelfTooltipManager::Close, weak_factory_.GetWeakPtr()));
   }
 }
 
 bool ShelfTooltipManager::ShouldShowTooltipForView(views::View* view) {
   return shelf_view_ && shelf_view_->ShouldShowTooltipForView(view) &&
          shelf_view_->wm_shelf()->GetVisibilityState() == SHELF_VISIBLE;
 }
 
 }  // namespace ash