mash: Migrate ShelfTooltipManager to wm common types.

ash/shelf/shelf_tooltip_manager_unittest.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/shelf/shelf_tooltip_manager.h"
+#include "ash/common/shelf/shelf_tooltip_manager.h"
 
 #include "ash/common/shelf/app_list_button.h"
 #include "ash/common/shelf/shelf_model.h"
-#include "ash/shelf/shelf_layout_manager.h"

[James Cook, 2016/07/26 16:31:14]

Hooray for eliminating this include!

[msw, 2016/07/26 17:43:25]

Acknowledged.

+#include "ash/common/shelf/wm_shelf.h"
+#include "ash/common/wm_shell.h"
 #include "ash/shelf/shelf_view.h"
-#include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/shelf_test_api.h"
 #include "ash/test/shelf_view_test_api.h"
 #include "ash/test/test_shelf_item_delegate.h"
 #include "base/memory/ptr_util.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/views/bubble/bubble_dialog_delegate.h"
 #include "ui/views/widget/widget.h"
@@ skipping 48 matching lines @@
   EXPECT_FALSE(IsTimerRunning());
 
   // The manager should not show or start the timer for a non-shelf view.
   views::View view;
   tooltip_manager_->ShowTooltip(&view);
   EXPECT_FALSE(tooltip_manager_->IsVisible());
   tooltip_manager_->ShowTooltipWithDelay(&view);
   EXPECT_FALSE(IsTimerRunning());
 
   // The manager should start the timer for a view on the shelf.
-  ShelfModel* model = shelf_view_->model();
+  ShelfModel* model = WmShell::Get()->shelf_model();
   ShelfItem item;
   item.type = TYPE_APP_SHORTCUT;
   const int index = model->Add(item);
   const ShelfID id = model->items()[index].id;
   model->SetShelfItemDelegate(
       id, base::WrapUnique(new TestShelfItemDelegate(nullptr)));
   // Note: There's no easy way to correlate shelf a model index/id to its view.
   tooltip_manager_->ShowTooltipWithDelay(
       shelf_view_->child_at(shelf_view_->child_count() - 1));
   EXPECT_TRUE(IsTimerRunning());
@@ skipping 13 matching lines @@
   // Create a full-screen window to hide the shelf.
   std::unique_ptr<views::Widget> widget(new views::Widget);
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW);
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.context = CurrentContext();
   widget->Init(params);
   widget->SetFullscreen(true);
   widget->Show();
 
   // Once the shelf is hidden, the tooltip should be invisible.
-  ASSERT_EQ(SHELF_HIDDEN, shelf_->shelf_layout_manager()->visibility_state());
+  ASSERT_EQ(SHELF_HIDDEN, GetPrimaryShelf()->GetVisibilityState());
   EXPECT_FALSE(tooltip_manager_->IsVisible());
 
   // Do not show the view if the shelf is hidden.
   tooltip_manager_->ShowTooltip(shelf_->GetAppListButton());
   EXPECT_FALSE(tooltip_manager_->IsVisible());
 
   // ShowTooltipWithDelay doesn't even start the timer for the hidden shelf.
   tooltip_manager_->ShowTooltipWithDelay(shelf_->GetAppListButton());
   EXPECT_FALSE(IsTimerRunning());
 }
 
 TEST_F(ShelfTooltipManagerTest, HideWhenShelfIsAutoHide) {
   // Create a visible window so auto-hide behavior is enforced.
   views::Widget* dummy = new views::Widget;
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW);
   params.bounds = gfx::Rect(0, 0, 200, 200);
   params.context = CurrentContext();
   dummy->Init(params);
   dummy->Show();
 
   tooltip_manager_->ShowTooltip(shelf_->GetAppListButton());
   ASSERT_TRUE(tooltip_manager_->IsVisible());
 
-  shelf_->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
-  shelf_->shelf_layout_manager()->UpdateAutoHideState();
-  ASSERT_EQ(SHELF_AUTO_HIDE_HIDDEN, shelf_->GetAutoHideState());
+  GetPrimaryShelf()->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
+  GetPrimaryShelf()->UpdateAutoHideState();
+  ASSERT_EQ(SHELF_AUTO_HIDE_HIDDEN, GetPrimaryShelf()->GetAutoHideState());
 
   // Tooltip visibility change for auto hide may take time.
   EXPECT_TRUE(tooltip_manager_->IsVisible());
   RunAllPendingInMessageLoop();
   EXPECT_FALSE(tooltip_manager_->IsVisible());
 
   // Do not show the view if the shelf is hidden.
   tooltip_manager_->ShowTooltip(shelf_->GetAppListButton());
   EXPECT_FALSE(tooltip_manager_->IsVisible());
 
   // ShowTooltipWithDelay doesn't even run the timer for the hidden shelf.
   tooltip_manager_->ShowTooltipWithDelay(shelf_->GetAppListButton());
   EXPECT_FALSE(IsTimerRunning());
 }
 
 TEST_F(ShelfTooltipManagerTest, HideForEvents) {
   ui::test::EventGenerator& generator = GetEventGenerator();
-  gfx::Rect shelf_bounds = shelf_->shelf_widget()->GetNativeWindow()->bounds();
+  gfx::Rect shelf_bounds = shelf_view_->GetBoundsInScreen();
 
   // Should hide if the mouse exits the shelf area.
   tooltip_manager_->ShowTooltip(shelf_->GetAppListButton());
   ASSERT_TRUE(tooltip_manager_->IsVisible());
   generator.MoveMouseTo(shelf_bounds.CenterPoint());
   generator.SendMouseExit();
   EXPECT_FALSE(tooltip_manager_->IsVisible());
 
   // Should hide if the mouse is pressed in the shelf area.
   tooltip_manager_->ShowTooltip(shelf_->GetAppListButton());
@@ skipping 11 matching lines @@
 
   // Should hide for gesture events in the shelf.
   tooltip_manager_->ShowTooltip(shelf_->GetAppListButton());
   ASSERT_TRUE(tooltip_manager_->IsVisible());
   generator.GestureTapDownAndUp(shelf_bounds.CenterPoint());
   EXPECT_FALSE(tooltip_manager_->IsVisible());
 }
 
 TEST_F(ShelfTooltipManagerTest, HideForExternalEvents) {
   ui::test::EventGenerator& generator = GetEventGenerator();
-  // TODO(msw): Observe events outside the shelf in mash, to close tooltips.
-  aura::Window* shelf_window = shelf_->shelf_widget()->GetNativeWindow();
-  bool closes = shelf_window->GetRootWindow() == Shell::GetPrimaryRootWindow();
 
   // Should hide for touches outside the shelf.
   tooltip_manager_->ShowTooltip(shelf_->GetAppListButton());
   ASSERT_TRUE(tooltip_manager_->IsVisible());
   generator.set_current_location(gfx::Point());
   generator.PressTouch();
-  EXPECT_EQ(tooltip_manager_->IsVisible(), !closes);
+  EXPECT_FALSE(tooltip_manager_->IsVisible());
   generator.ReleaseTouch();
 
   // Should hide for touch events on the tooltip.
   tooltip_manager_->ShowTooltip(shelf_->GetAppListButton());
   ASSERT_TRUE(tooltip_manager_->IsVisible());
   generator.set_current_location(
       GetTooltip()->GetWindowBoundsInScreen().CenterPoint());
   generator.PressTouch();
-  EXPECT_EQ(tooltip_manager_->IsVisible(), !closes);
+  EXPECT_FALSE(tooltip_manager_->IsVisible());
   generator.ReleaseTouch();
 
   // Should hide for gestures outside the shelf.
   tooltip_manager_->ShowTooltip(shelf_->GetAppListButton());
   ASSERT_TRUE(tooltip_manager_->IsVisible());
   generator.GestureTapDownAndUp(gfx::Point());
-  EXPECT_EQ(tooltip_manager_->IsVisible(), !closes);
+  EXPECT_FALSE(tooltip_manager_->IsVisible());
 }
 
 TEST_F(ShelfTooltipManagerTest, DoNotHideForKeyEvents) {
   ui::test::EventGenerator& generator = GetEventGenerator();
 
   // Should not hide for key events.
   tooltip_manager_->ShowTooltip(shelf_->GetAppListButton());
   ASSERT_TRUE(tooltip_manager_->IsVisible());
   generator.PressKey(ui::VKEY_A, ui::EF_NONE);
   EXPECT_TRUE(tooltip_manager_->IsVisible());
 }
 
 }  // namespace test
 }  // namespace ash