Refactors DockedWindowLayoutManager in terms of ash/wm/common

ash/system/toast/toast_manager_unittest.cc

 // Copyright 2016 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/display/display_manager.h"
 #include "ash/screen_util.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shell.h"
 #include "ash/system/toast/toast_manager.h"
@@ skipping 45 matching lines @@
     ToastOverlay* overlay = GetCurrentOverlay();
     return overlay ? overlay->text_ : std::string();
   }
 
   void ClickDismissButton() {
     ToastOverlay* overlay = GetCurrentOverlay();
     if (overlay)
       overlay->ClickDismissButtonForTesting(DummyEvent());
   }
 
-  void SetShelfAlignment(ShelfAlignment alignment) {
+  void SetShelfAlignment(wm::ShelfAlignment alignment) {
     Shelf::ForPrimaryDisplay()->shelf_layout_manager()->SetAlignment(alignment);
   }
 
   void SetShelfState(ShelfVisibilityState state) {
     Shelf::ForPrimaryDisplay()->shelf_layout_manager()->SetState(state);
   }
 
   void SetShelfAutoHideBehavior(ShelfAutoHideBehavior behavior) {
     Shelf::ForPrimaryDisplay()->shelf_layout_manager()->SetAutoHideBehavior(
         behavior);
@@ skipping 60 matching lines @@
   while (GetToastId() != 3)
     base::RunLoop().RunUntilIdle();
 
   EXPECT_EQ("DUMMY3", GetCurrentText());
 }
 
 TEST_F(ToastManagerTest, PositionWithVisibleBottomShelf) {
   ShelfLayoutManager* shelf =
       Shelf::ForPrimaryDisplay()->shelf_layout_manager();
   SetShelfState(ash::SHELF_VISIBLE);
-  SetShelfAlignment(ash::SHELF_ALIGNMENT_BOTTOM);
+  SetShelfAlignment(wm::SHELF_ALIGNMENT_BOTTOM);
 
   manager()->Show("DUMMY", kLongLongDuration /* prevent timeout */);
   EXPECT_EQ(1, GetToastId());
 
   gfx::Rect toast_bounds = GetCurrentWidget()->GetWindowBoundsInScreen();
   gfx::Rect root_bounds =
       ScreenUtil::GetShelfDisplayBoundsInRoot(Shell::GetPrimaryRootWindow());
 
   EXPECT_TRUE(toast_bounds.Intersects(shelf->user_work_area_bounds()));
   EXPECT_NEAR(root_bounds.CenterPoint().x(), toast_bounds.CenterPoint().x(), 1);
 
   if (SupportsHostWindowResize()) {
     // If host resize is not supported, ShelfLayoutManager::GetIdealBounds()
     // doesn't return correct value.
     gfx::Rect shelf_bounds = shelf->GetIdealBounds();
     EXPECT_FALSE(toast_bounds.Intersects(shelf_bounds));
     EXPECT_EQ(shelf_bounds.y() - 5, toast_bounds.bottom());
     EXPECT_EQ(root_bounds.bottom() - shelf_bounds.height() - 5,
               toast_bounds.bottom());
   }
 }
 
 TEST_F(ToastManagerTest, PositionWithAutoHiddenBottomShelf) {
   std::unique_ptr<aura::Window> window(
       CreateTestWindowInShellWithBounds(gfx::Rect(1, 2, 3, 4)));
 
   ShelfLayoutManager* shelf =
       Shelf::ForPrimaryDisplay()->shelf_layout_manager();
-  SetShelfAlignment(ash::SHELF_ALIGNMENT_BOTTOM);
+  SetShelfAlignment(wm::SHELF_ALIGNMENT_BOTTOM);
   SetShelfAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
   shelf->LayoutShelf();
   EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, shelf->auto_hide_state());
 
   manager()->Show("DUMMY", kLongLongDuration /* prevent timeout */);
   EXPECT_EQ(1, GetToastId());
 
   gfx::Rect toast_bounds = GetCurrentWidget()->GetWindowBoundsInScreen();
   gfx::Rect root_bounds =
       ScreenUtil::GetShelfDisplayBoundsInRoot(Shell::GetPrimaryRootWindow());
 
   EXPECT_TRUE(toast_bounds.Intersects(shelf->user_work_area_bounds()));
   EXPECT_NEAR(root_bounds.CenterPoint().x(), toast_bounds.CenterPoint().x(), 1);
   EXPECT_EQ(root_bounds.bottom() - ShelfLayoutManager::kAutoHideSize - 5,
             toast_bounds.bottom());
 }
 
 TEST_F(ToastManagerTest, PositionWithHiddenBottomShelf) {
   ShelfLayoutManager* shelf =
       Shelf::ForPrimaryDisplay()->shelf_layout_manager();
   SetShelfAutoHideBehavior(SHELF_AUTO_HIDE_ALWAYS_HIDDEN);
-  SetShelfAlignment(ash::SHELF_ALIGNMENT_BOTTOM);
+  SetShelfAlignment(wm::SHELF_ALIGNMENT_BOTTOM);
   SetShelfState(ash::SHELF_HIDDEN);
 
   manager()->Show("DUMMY", kLongLongDuration /* prevent timeout */);
   EXPECT_EQ(1, GetToastId());
 
   gfx::Rect toast_bounds = GetCurrentWidget()->GetWindowBoundsInScreen();
   gfx::Rect root_bounds =
       ScreenUtil::GetShelfDisplayBoundsInRoot(Shell::GetPrimaryRootWindow());
 
   EXPECT_TRUE(toast_bounds.Intersects(shelf->user_work_area_bounds()));
   EXPECT_NEAR(root_bounds.CenterPoint().x(), toast_bounds.CenterPoint().x(), 1);
   EXPECT_EQ(root_bounds.bottom() - 5, toast_bounds.bottom());
 }
 
 TEST_F(ToastManagerTest, PositionWithVisibleLeftShelf) {
   ShelfLayoutManager* shelf =
       Shelf::ForPrimaryDisplay()->shelf_layout_manager();
   SetShelfState(ash::SHELF_VISIBLE);
-  SetShelfAlignment(ash::SHELF_ALIGNMENT_LEFT);
+  SetShelfAlignment(wm::SHELF_ALIGNMENT_LEFT);
 
   manager()->Show("DUMMY", kLongLongDuration /* prevent timeout */);
   EXPECT_EQ(1, GetToastId());
 
   gfx::Rect toast_bounds = GetCurrentWidget()->GetWindowBoundsInScreen();
   gfx::Rect root_bounds =
       ScreenUtil::GetShelfDisplayBoundsInRoot(Shell::GetPrimaryRootWindow());
 
   EXPECT_TRUE(toast_bounds.Intersects(shelf->user_work_area_bounds()));
   EXPECT_EQ(root_bounds.bottom() - 5, toast_bounds.bottom());
@@ skipping 13 matching lines @@
   if (!SupportsMultipleDisplays())
     return;
 
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
   display_manager->SetUnifiedDesktopEnabled(true);
   UpdateDisplay("1000x500,0+600-100x500");
 
   ShelfLayoutManager* shelf =
       Shelf::ForPrimaryDisplay()->shelf_layout_manager();
   SetShelfState(ash::SHELF_VISIBLE);
-  SetShelfAlignment(ash::SHELF_ALIGNMENT_BOTTOM);
+  SetShelfAlignment(wm::SHELF_ALIGNMENT_BOTTOM);
 
   manager()->Show("DUMMY", kLongLongDuration /* prevent timeout */);
   EXPECT_EQ(1, GetToastId());
 
   gfx::Rect toast_bounds = GetCurrentWidget()->GetWindowBoundsInScreen();
   gfx::Rect root_bounds =
       ScreenUtil::GetShelfDisplayBoundsInRoot(Shell::GetPrimaryRootWindow());
 
   EXPECT_TRUE(toast_bounds.Intersects(shelf->user_work_area_bounds()));
   EXPECT_TRUE(root_bounds.Contains(toast_bounds));
   EXPECT_NEAR(root_bounds.CenterPoint().x(), toast_bounds.CenterPoint().x(), 1);
 
   if (SupportsHostWindowResize()) {
     // If host resize is not supported, ShelfLayoutManager::GetIdealBounds()
     // doesn't return correct value.
     gfx::Rect shelf_bounds = shelf->GetIdealBounds();
     EXPECT_FALSE(toast_bounds.Intersects(shelf_bounds));
     EXPECT_EQ(shelf_bounds.y() - 5, toast_bounds.bottom());
     EXPECT_EQ(root_bounds.bottom() - shelf_bounds.height() - 5,
               toast_bounds.bottom());
   }
 }
 
 }  // namespace ash