ash: Move alignment and autohide behavior from Shelf to WmShelf

ash/wm/panels/panel_layout_manager_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/wm/panels/panel_layout_manager.h"
 
 #include "ash/aura/wm_window_aura.h"
 #include "ash/common/ash_switches.h"
 #include "ash/common/display/display_info.h"
-#include "ash/common/shelf/shelf.h"
 #include "ash/common/shelf/shelf_button.h"
 #include "ash/common/shelf/shelf_layout_manager.h"
 #include "ash/common/shelf/shelf_model.h"
 #include "ash/common/shelf/shelf_types.h"
 #include "ash/common/shelf/shelf_view.h"
 #include "ash/common/shelf/shelf_widget.h"
+#include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/system/web_notification/web_notification_tray.h"
 #include "ash/common/wm/mru_window_tracker.h"
 #include "ash/common/wm/window_state.h"
+#include "ash/common/wm_root_window_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/display/display_manager.h"
 #include "ash/screen_util.h"
 #include "ash/shelf/shelf_util.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/display_manager_test_api.h"
 #include "ash/test/shelf_test_api.h"
 #include "ash/test/shelf_view_test_api.h"
 #include "ash/test/test_shelf_delegate.h"
@@ skipping 36 matching lines @@
 
 class PanelLayoutManagerTest : public test::AshTestBase {
  public:
   PanelLayoutManagerTest() {}
   ~PanelLayoutManagerTest() override {}
 
   void SetUp() override {
     test::AshTestBase::SetUp();
     ASSERT_TRUE(test::TestShelfDelegate::instance());
 
-    shelf_view_test_.reset(
-        new test::ShelfViewTestAPI(GetShelfView(Shelf::ForPrimaryDisplay())));
+    shelf_view_test_.reset(new test::ShelfViewTestAPI(
+        GetPrimaryShelf()->GetShelfViewForTesting()));
     shelf_view_test_->SetAnimationDuration(1);
 
     WebNotificationTray::DisableAnimationsForTest(true);
   }
 
   void TearDown() override {
     test::AshTestBase::TearDown();
 
     WebNotificationTray::DisableAnimationsForTest(false);  // Reenable animation
   }
@@ skipping 55 matching lines @@
     gfx::Rect window2_bounds = panel2->GetBoundsInRootWindow();
 
     EXPECT_FALSE(window1_bounds.Intersects(window2_bounds));
   }
 
   void IsPanelAboveLauncherIcon(aura::Window* panel) {
     // Waits until all shelf view animations are done.
     shelf_view_test()->RunMessageLoopUntilAnimationsDone();
 
     WmWindow* wm_panel = WmWindowAura::Get(panel);
-    Shelf* shelf = Shelf::ForWindow(wm_panel);
+    WmShelf* shelf = wm_panel->GetRootWindowController()->GetShelf();
     gfx::Rect icon_bounds = shelf->GetScreenBoundsOfItemIconForWindow(wm_panel);
     ASSERT_FALSE(icon_bounds.width() == 0 && icon_bounds.height() == 0);
 
     gfx::Rect window_bounds = panel->GetBoundsInScreen();
     ASSERT_LT(icon_bounds.width(), window_bounds.width());
     ASSERT_LT(icon_bounds.height(), window_bounds.height());
-    gfx::Rect shelf_bounds = shelf->shelf_widget()->GetWindowBoundsInScreen();
+    gfx::Rect shelf_bounds =
+        shelf->GetShelfWidgetForTesting()->GetWindowBoundsInScreen();
     const ShelfAlignment alignment = shelf->alignment();
 
     if (IsHorizontal(alignment)) {
       // The horizontal bounds of the panel window should contain the bounds of
       // the shelf icon.
       EXPECT_LE(window_bounds.x(), icon_bounds.x());
       EXPECT_GE(window_bounds.right(), icon_bounds.right());
     } else {
       // The vertical bounds of the panel window should contain the bounds of
       // the shelf icon.
       EXPECT_LE(window_bounds.y(), icon_bounds.y());
       EXPECT_GE(window_bounds.bottom(), icon_bounds.bottom());
     }
 
     if (alignment == SHELF_ALIGNMENT_LEFT)
       EXPECT_EQ(shelf_bounds.right(), window_bounds.x());
     else if (alignment == SHELF_ALIGNMENT_RIGHT)
       EXPECT_EQ(shelf_bounds.x(), window_bounds.right());
     else
       EXPECT_EQ(shelf_bounds.y(), window_bounds.bottom());
   }
 
   void IsCalloutAboveLauncherIcon(aura::Window* panel) {
     // Flush the message loop, since callout updates use a delayed task.
     base::RunLoop().RunUntilIdle();
     views::Widget* widget = GetCalloutWidgetForPanel(panel);
 
     WmWindow* wm_panel = WmWindowAura::Get(panel);
-    Shelf* shelf = Shelf::ForWindow(wm_panel);
+    WmShelf* shelf = wm_panel->GetRootWindowController()->GetShelf();
     gfx::Rect icon_bounds = shelf->GetScreenBoundsOfItemIconForWindow(wm_panel);
     ASSERT_FALSE(icon_bounds.IsEmpty());
 
     gfx::Rect panel_bounds = panel->GetBoundsInScreen();
     gfx::Rect callout_bounds = widget->GetWindowBoundsInScreen();
     ASSERT_FALSE(icon_bounds.IsEmpty());
 
     EXPECT_TRUE(widget->IsVisible());
 
     const ShelfAlignment alignment = shelf->alignment();
@@ skipping 30 matching lines @@
         GetShelfIDForWindow(window));
     gfx::Rect bounds = test_api.GetButton(index)->GetBoundsInScreen();
 
     ui::test::EventGenerator& event_generator = GetEventGenerator();
     event_generator.MoveMouseTo(bounds.CenterPoint());
     event_generator.ClickLeftButton();
 
     test_api.RunMessageLoopUntilAnimationsDone();
   }
 
+  WmShelf* GetShelfForWindow(aura::Window* window) {
+    return WmWindowAura::Get(window)->GetRootWindowController()->GetShelf();
+  }
+
   void SetAlignment(aura::Window* root_window, ShelfAlignment alignment) {
-    Shelf::ForWindow(WmWindowAura::Get(root_window))->SetAlignment(alignment);
+    GetShelfForWindow(root_window)->SetAlignment(alignment);
   }
 
   void SetShelfAutoHideBehavior(aura::Window* window,
                                 ShelfAutoHideBehavior behavior) {
-    Shelf* shelf = Shelf::ForWindow(WmWindowAura::Get(window));
+    WmShelf* shelf = GetShelfForWindow(window);
     shelf->SetAutoHideBehavior(behavior);
-    test::ShelfViewTestAPI test_api(GetShelfView(shelf));
+    test::ShelfViewTestAPI test_api(shelf->GetShelfViewForTesting());
     test_api.RunMessageLoopUntilAnimationsDone();
   }
 
   void SetShelfVisibilityState(aura::Window* window,
                                ShelfVisibilityState visibility_state) {
-    Shelf* shelf = Shelf::ForWindow(WmWindowAura::Get(window));
+    WmShelf* shelf = GetShelfForWindow(window);
     shelf->shelf_layout_manager()->SetState(visibility_state);
   }
 
-  ShelfView* GetShelfView(Shelf* shelf) {
-    return test::ShelfTestAPI(shelf).shelf_view();
-  }
-
  private:
   std::unique_ptr<test::ShelfViewTestAPI> shelf_view_test_;
 
   bool IsHorizontal(ShelfAlignment alignment) {
     return alignment == SHELF_ALIGNMENT_BOTTOM;
   }
 
   DISALLOW_COPY_AND_ASSIGN(PanelLayoutManagerTest);
 };
 
@@ skipping 332 matching lines @@
 TEST_F(PanelLayoutManagerTest, FanWindows) {
   gfx::Rect bounds(0, 0, 201, 201);
   std::unique_ptr<aura::Window> w1(CreatePanelWindow(bounds));
   std::unique_ptr<aura::Window> w2(CreatePanelWindow(bounds));
   std::unique_ptr<aura::Window> w3(CreatePanelWindow(bounds));
 
   shelf_view_test()->RunMessageLoopUntilAnimationsDone();
   int window_x1 = w1->GetBoundsInRootWindow().CenterPoint().x();
   int window_x2 = w2->GetBoundsInRootWindow().CenterPoint().x();
   int window_x3 = w3->GetBoundsInRootWindow().CenterPoint().x();
-  Shelf* shelf = Shelf::ForPrimaryDisplay();
+  WmShelf* shelf = GetPrimaryShelf();
   int icon_x1 =
       shelf->GetScreenBoundsOfItemIconForWindow(WmWindowAura::Get(w1.get()))
           .x();
   int icon_x2 =
       shelf->GetScreenBoundsOfItemIconForWindow(WmWindowAura::Get(w2.get()))
           .x();
   EXPECT_EQ(window_x2 - window_x1, window_x3 - window_x2);
   int spacing = window_x2 - window_x1;
   EXPECT_GT(spacing, icon_x2 - icon_x1);
 }
@@ skipping 48 matching lines @@
 
   std::unique_ptr<aura::Window> p1_d1(
       CreatePanelWindow(gfx::Rect(0, 0, 50, 50)));
   std::unique_ptr<aura::Window> p2_d1(
       CreatePanelWindow(gfx::Rect(0, 0, 50, 50)));
   std::unique_ptr<aura::Window> p1_d2(
       CreatePanelWindow(gfx::Rect(600, 0, 50, 50)));
   std::unique_ptr<aura::Window> p2_d2(
       CreatePanelWindow(gfx::Rect(600, 0, 50, 50)));
 
-  ShelfView* shelf_view_1st = GetShelfView(Shelf::ForPrimaryDisplay());
+  ShelfView* shelf_view_1st = GetPrimaryShelf()->GetShelfViewForTesting();
   ShelfView* shelf_view_2nd =
-      GetShelfView(Shelf::ForWindow(WmWindowAura::Get(root_windows[1])));
+      GetShelfForWindow(root_windows[1])->GetShelfViewForTesting();
 
   EXPECT_EQ(root_windows[0], p1_d1->GetRootWindow());
   EXPECT_EQ(root_windows[0], p2_d1->GetRootWindow());
   EXPECT_EQ(root_windows[1], p1_d2->GetRootWindow());
   EXPECT_EQ(root_windows[1], p2_d2->GetRootWindow());
 
   EXPECT_EQ(kShellWindowId_PanelContainer, p1_d1->parent()->id());
   EXPECT_EQ(kShellWindowId_PanelContainer, p2_d1->parent()->id());
   EXPECT_EQ(kShellWindowId_PanelContainer, p1_d2->parent()->id());
   EXPECT_EQ(kShellWindowId_PanelContainer, p2_d2->parent()->id());
@@ skipping 214 matching lines @@
   touch.set_location(gfx::Point(bounds.x() - 1, bounds.y() + 5));
   target = targeter->FindTargetForEvent(root, &touch);
   EXPECT_NE(w.get(), target);
 }
 
 INSTANTIATE_TEST_CASE_P(LtrRtl,
                         PanelLayoutManagerTextDirectionTest,
                         testing::Bool());
 
 }  // namespace ash