Adds AppListDelegate to AppList that is notified on visibility changes

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 35 matching lines @@
 #include "base/test/histogram_tester.h"
 #include "base/test/scoped_mock_time_message_loop_task_runner.h"
 #include "base/test/user_action_tester.h"
 #include "base/time/time.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "ui/app_list/presenter/app_list.h"
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/compositor/layer.h"
+#include "ui/display/display.h"
+#include "ui/display/screen.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/views/animation/ink_drop_impl.h"
 #include "ui/views/animation/test/ink_drop_host_view_test_api.h"
 #include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/view_model.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 #include "ui/wm/core/coordinate_conversion.h"
 
 using testing::ElementsAre;
 using testing::IsEmpty;
 
 namespace ash {
 namespace test {
+namespace {
+
+int64_t GetPrimaryDisplayId() {
+  return display::Screen::GetScreen()->GetPrimaryDisplay().id();
+}
+
+}  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // WmShelfObserver::OnShelfIconPositionsChanged tests.
 
 class TestWmShelfObserver : public WmShelfObserver {
  public:
   explicit TestWmShelfObserver(WmShelf* shelf) : shelf_(shelf) {
     shelf_->AddObserver(this);
   }
 
@@ skipping 1381 matching lines @@
       gfx::Point(all_area.x() - 1, all_area.y())));
   EXPECT_TRUE(shelf_view_->ShouldHideTooltip(
       gfx::Point(all_area.x(), all_area.y() - 1)));
   EXPECT_TRUE(shelf_view_->ShouldHideTooltip(
       gfx::Point(all_area.x(), all_area.bottom())));
 }
 
 TEST_F(ShelfViewTest, ShouldHideTooltipWithAppListWindowTest) {
   // Trigger mock notifications that the app list was shown.
   WmShell::Get()->app_list()->OnTargetVisibilityChanged(true);
-  WmShell::Get()->app_list()->OnVisibilityChanged(true);
+  WmShell::Get()->app_list()->OnVisibilityChanged(true, GetPrimaryDisplayId());
   AppListButton* app_list_button = shelf_view_->GetAppListButton();
   app_list_button->OnAppListShown();
 
   // The tooltip shouldn't hide if the mouse is on normal buttons.
   for (int i = 1; i < test_api_->GetButtonCount(); i++) {
     ShelfButton* button = test_api_->GetButton(i);
     if (!button)
       continue;
 
     EXPECT_FALSE(shelf_view_->ShouldHideTooltip(
@@ skipping 623 matching lines @@
 
   void DismissAppList() {
     // Trigger a mock notification that the app list was dismissed.
     WmShell::Get()->app_list()->OnTargetVisibilityChanged(false);
     app_list_button_->OnAppListDismissed();
   }
 
   void FinishAppListVisibilityChange() {
     // Trigger a mock notification that the app list finished animating.
     app_list::AppList* app_list = WmShell::Get()->app_list();
-    app_list->OnVisibilityChanged(app_list->GetTargetVisibility());
+    app_list->OnVisibilityChanged(app_list->GetTargetVisibility(),
+                                  GetPrimaryDisplayId());
   }
 
   AppListButton* app_list_button_ = nullptr;
   InkDropSpy* app_list_button_ink_drop_ = nullptr;
   ShelfButton* browser_button_ = nullptr;
   InkDropSpy* browser_button_ink_drop_ = nullptr;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ShelfViewInkDropTest);
 };
@@ skipping 922 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