Cros: Dismiss tooltip when shelf scrolls

Bug: 1005171
Change-Id: Ib89421a831edecce2c9eb3d35ab6b477557127a1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1838914Reviewed-by: Alex Newcomer <newcomer@chromium.org>
Reviewed-by: Manu Cornet <manucornet@chromium.org>
Commit-Queue: Ana Salazar <anasalazar@chromium.org>
Cr-Commit-Position: refs/heads/master@{#702900}

ash/shelf/shelf_tooltip_manager.cc

@@ -146,6 +146,11 @@ void ShelfTooltipManager::OnTouchEvent(ui::TouchEvent* event) {
     ProcessPressedEvent(*event);
 }
 
+void ShelfTooltipManager::OnScrollEvent(ui::ScrollEvent* event) {
+  // Close any currently shown bubble.
+  Close();
+}
+
 void ShelfTooltipManager::OnKeyEvent(ui::KeyEvent* event) {
   // Close any currently shown bubble.
   Close();

ash/shelf/shelf_tooltip_manager.h

@@ -59,6 +59,7 @@ class ASH_EXPORT ShelfTooltipManager : public ui::EventHandler,
   // ui::EventHandler overrides:
   void OnMouseEvent(ui::MouseEvent* event) override;
   void OnTouchEvent(ui::TouchEvent* event) override;
+  void OnScrollEvent(ui::ScrollEvent* event) override;
   void OnKeyEvent(ui::KeyEvent* event) override;
 
   // ShelfObserver overrides:

ash/shelf/shelf_tooltip_manager_unittest.cc

@@ -250,4 +250,16 @@ TEST_F(ShelfTooltipManagerTest, ShelfTooltipDoesNotAffectPipWindow) {
                 CollisionDetectionUtils::RelativePriority::kPictureInPicture));
 }
 
+TEST_F(ShelfTooltipManagerTest, ShelfTooltipClosesIfScroll) {
+  ui::test::EventGenerator* generator = GetEventGenerator();
+
+  ShowTooltipForFirstAppIcon();
+  ASSERT_TRUE(tooltip_manager_->IsVisible());
+  gfx::Point cursor_position_in_screen =
+      display::Screen::GetScreen()->GetCursorScreenPoint();
+  generator->ScrollSequence(cursor_position_in_screen, base::TimeDelta(), 0, 3,
+                            10, 1);
+  EXPECT_FALSE(tooltip_manager_->IsVisible());
+}
+
 }  // namespace ash