Shelf: Hide overflow bubble when app launched from overflow.

ash/shelf/shelf_view_unittest.cc

 // Copyright (c) 2012 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_view.h"
 
 #include <algorithm>
 #include <memory>
 #include <utility>
 #include <vector>
@@ skipping 671 matching lines @@
   }
 
   void ReplaceShelfDelegate() {
     // Clear the value first to avoid TestShelfDelegate's singleton check.
     test::ShellTestApi().SetShelfDelegate(nullptr);
     shelf_delegate_ = new TestShelfDelegateForShelfView();
     test_api_->SetShelfDelegate(shelf_delegate_);
     test::ShellTestApi().SetShelfDelegate(base::WrapUnique(shelf_delegate_));
   }
 
+  // Returns the center coordinates for a button. Helper function for an event
+  // generator.
+  gfx::Point GetButtonCenter(ShelfID button_id) {
+    return GetButtonCenter(
+        test_api_->GetButton(model_->ItemIndexByID(button_id)));
+  }
+
+  gfx::Point GetButtonCenter(ShelfButton* button) {
+    return button->GetBoundsInScreen().CenterPoint();
+  }
+
   ShelfModel* model_;
   ShelfView* shelf_view_;
   int browser_index_;
 
   // Owned by ash::WmShell.
   TestShelfDelegateForShelfView* shelf_delegate_;
 
   std::unique_ptr<ShelfViewTestAPI> test_api_;
 
  private:
@@ skipping 1123 matching lines @@
   selection_tracker->set_item_selected_action(SHELF_ACTION_WINDOW_MINIMIZED);
   SimulateClick(browser_index_);
 
   selection_tracker->set_item_selected_action(SHELF_ACTION_WINDOW_ACTIVATED);
   SimulateClick(browser_index_);
 
   histogram_tester.ExpectTotalCount(
       kTimeBetweenWindowMinimizedAndActivatedActionsHistogramName, 1);
 }
 
+TEST_F(ShelfViewTest, TestHideOverflow) {
+  // Use an event generator instead of SimulateClick because the overflow bubble
+  // is a PointerWatcher and gets the events directly.
+  ui::test::EventGenerator& generator = GetEventGenerator();
+
+  // Add one app (which is on the main shelf) and then add buttons until
+  // overflow. Add two more apps (which are on the overflow shelf).
+  ShelfID first_app_id = AddAppShortcut();
+  AddButtonsUntilOverflow();
+  ShelfID overflow_app_id1 = AddAppShortcut();
+  ShelfID overflow_app_id2 = AddAppShortcut();
+
+  // Verify that by clicking anywhere outside the shelf and overflow bubble, the
+  // overflow bubble will close if it were open.
+  EXPECT_FALSE(test_api_->IsShowingOverflowBubble());
+  test_api_->ShowOverflowBubble();
+  const gfx::Point kPointNotOnShelfOrOverflow = gfx::Point(0, 0);

[msw, 2017/04/06 21:57:50]

Remove this constant and skip set_current_location; (0,0) is the default
EventGenerator |initial_location|. If you want, instead check that
generator.current_location() is not on the shelf or overflow bubble (but that
might also be a bit unnecessary)

[sammiequon, 2017/04/06 23:03:11]

Done.

+
+  // Make sure the point we chose is not on the shelf or its overflow bubble.
+  ASSERT_FALSE(test_api_->shelf_view()->GetBoundsInScreen().Contains(
+      kPointNotOnShelfOrOverflow));
+  ASSERT_FALSE(
+      test_api_->overflow_bubble()->shelf_view()->GetBoundsInScreen().Contains(
+          kPointNotOnShelfOrOverflow));
+  generator.set_current_location(kPointNotOnShelfOrOverflow);
+  generator.ClickLeftButton();
+  EXPECT_FALSE(test_api_->IsShowingOverflowBubble());
+
+  // Verify that by clicking a app which is on the main shelf while the overflow
+  // bubble is opened, the overflow bubble will close.
+  EXPECT_FALSE(test_api_->IsShowingOverflowBubble());
+  test_api_->ShowOverflowBubble();
+  generator.set_current_location(GetButtonCenter(first_app_id));
+  generator.ClickLeftButton();
+  EXPECT_FALSE(test_api_->IsShowingOverflowBubble());
+
+  // Verify that by clicking a app which is on the overflow shelf, the overflow
+  // bubble will close.
+  EXPECT_FALSE(test_api_->IsShowingOverflowBubble());
+  test_api_->ShowOverflowBubble();
+  ShelfViewTestAPI test_api_for_overflow(
+      test_api_->overflow_bubble()->shelf_view());
+  ShelfButton* button_on_overflow_shelf =
+      test_api_for_overflow.GetButton(model_->ItemIndexByID(overflow_app_id2));
+  generator.set_current_location(GetButtonCenter(button_on_overflow_shelf));
+  generator.ClickLeftButton();
+  EXPECT_FALSE(test_api_->IsShowingOverflowBubble());
+
+  // Verify dragging apps on the overflow shelf does not close the overflow
+  // bubble.
+  EXPECT_FALSE(test_api_->IsShowingOverflowBubble());
+  test_api_->ShowOverflowBubble();
+  ShelfViewTestAPI test_api_for_overflow2(

[msw, 2017/04/06 21:57:50]

optional nit: |test_api_for_overflow1|

[sammiequon, 2017/04/06 23:03:11]

Done.

+      test_api_->overflow_bubble()->shelf_view());
+  ShelfButton* button_on_overflow_shelf1 =
+      test_api_for_overflow2.GetButton(model_->ItemIndexByID(overflow_app_id1));
+  ShelfButton* button_on_overflow_shelf2 =
+      test_api_for_overflow2.GetButton(model_->ItemIndexByID(overflow_app_id2));
+  generator.set_current_location(GetButtonCenter(button_on_overflow_shelf1));
+  generator.DragMouseTo(GetButtonCenter(button_on_overflow_shelf2));
+  EXPECT_TRUE(test_api_->IsShowingOverflowBubble());
+}
+
 class ShelfViewVisibleBoundsTest : public ShelfViewTest,
                                    public testing::WithParamInterface<bool> {
  public:
   ShelfViewVisibleBoundsTest() : text_direction_change_(GetParam()) {}
 
   void CheckAllItemsAreInBounds() {
     gfx::Rect visible_bounds = shelf_view_->GetVisibleItemsBoundsInScreen();
     gfx::Rect shelf_bounds = shelf_view_->GetBoundsInScreen();
     EXPECT_TRUE(shelf_bounds.Contains(visible_bounds));
     for (int i = 0; i < test_api_->GetButtonCount(); ++i)
@@ skipping 1202 matching lines @@
   EXPECT_EQ(views::InkDropState::ACTIVATED,
             overflow_button_ink_drop_->GetTargetInkDropState());
   EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(),
               IsEmpty());
 
   ASSERT_TRUE(test_api_->IsShowingOverflowBubble());
 }
 
 }  // namespace test
 }  // namespace ash