Refactors DockedWindowLayoutManager in terms of ash/wm/common

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/wm/panels/panel_layout_manager.h"
 
 #include "ash/ash_switches.h"
 #include "ash/screen_util.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_button.h"
@@ skipping 109 matching lines @@
     shelf_view_test()->RunMessageLoopUntilAnimationsDone();
 
     Shelf* shelf = Shelf::ForWindow(panel);
     gfx::Rect icon_bounds = shelf->GetScreenBoundsOfItemIconForWindow(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();
-    ShelfAlignment alignment = GetAlignment(panel->GetRootWindow());
+    wm::ShelfAlignment alignment = GetAlignment(panel->GetRootWindow());
 
     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)
+    if (alignment == wm::SHELF_ALIGNMENT_LEFT)
       EXPECT_EQ(shelf_bounds.right(), window_bounds.x());
-    else if (alignment == SHELF_ALIGNMENT_RIGHT)
+    else if (alignment == wm::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);
 
     Shelf* shelf = Shelf::ForWindow(panel);
     gfx::Rect icon_bounds = shelf->GetScreenBoundsOfItemIconForWindow(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());
 
-    ShelfAlignment alignment = GetAlignment(panel->GetRootWindow());
-    if (alignment == SHELF_ALIGNMENT_LEFT)
+    wm::ShelfAlignment alignment = GetAlignment(panel->GetRootWindow());
+    if (alignment == wm::SHELF_ALIGNMENT_LEFT)
       EXPECT_EQ(panel_bounds.x(), callout_bounds.right());
-    else if (alignment == SHELF_ALIGNMENT_RIGHT)
+    else if (alignment == wm::SHELF_ALIGNMENT_RIGHT)
       EXPECT_EQ(panel_bounds.right(), callout_bounds.x());
     else
       EXPECT_EQ(panel_bounds.bottom(), callout_bounds.y());
 
     if (IsHorizontal(alignment)) {
       EXPECT_NEAR(icon_bounds.CenterPoint().x(),
                   widget->GetWindowBoundsInScreen().CenterPoint().x(),
                   1);
     } else {
       EXPECT_NEAR(icon_bounds.CenterPoint().y(),
@@ skipping 21 matching lines @@
     int index = model->ItemIndexByID(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();
   }
 
-  void SetAlignment(aura::Window* root_window, ShelfAlignment alignment) {
+  void SetAlignment(aura::Window* root_window, wm::ShelfAlignment alignment) {
     Shelf::ForWindow(root_window)->SetAlignment(alignment);
   }
 
-  ShelfAlignment GetAlignment(const aura::Window* root_window) {
+  wm::ShelfAlignment GetAlignment(const aura::Window* root_window) {
     return Shelf::ForWindow(root_window)->alignment();
   }
 
   void SetShelfAutoHideBehavior(aura::Window* window,
                                 ShelfAutoHideBehavior behavior) {
     Shelf* shelf = Shelf::ForWindow(window);
     shelf->shelf_layout_manager()->SetAutoHideBehavior(behavior);
     test::ShelfViewTestAPI test_api(GetShelfView(shelf));
     test_api.RunMessageLoopUntilAnimationsDone();
   }
 
   void SetShelfVisibilityState(aura::Window* window,
                                ShelfVisibilityState visibility_state) {
     Shelf* shelf = Shelf::ForWindow(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;
+  bool IsHorizontal(wm::ShelfAlignment alignment) {
+    return alignment == wm::SHELF_ALIGNMENT_BOTTOM;
   }
 
   DISALLOW_COPY_AND_ASSIGN(PanelLayoutManagerTest);
 };
 
 class PanelLayoutManagerTextDirectionTest
     : public PanelLayoutManagerTest,
       public testing::WithParamInterface<bool> {
  public:
   PanelLayoutManagerTextDirectionTest() : is_rtl_(GetParam()) {}
@@ skipping 107 matching lines @@
   EXPECT_TRUE(WindowIsAbove(w2.get(), w3.get()));
   EXPECT_TRUE(WindowIsAbove(w2.get(), w1.get()));
 
   wm::ActivateWindow(w3.get());
   EXPECT_TRUE(WindowIsAbove(w3.get(), w2.get()));
   EXPECT_TRUE(WindowIsAbove(w2.get(), w1.get()));
 }
 
 TEST_F(PanelLayoutManagerTest, MultiplePanelStackingVertical) {
   // Set shelf to be aligned on the right.
-  SetAlignment(Shell::GetPrimaryRootWindow(), SHELF_ALIGNMENT_RIGHT);
+  SetAlignment(Shell::GetPrimaryRootWindow(), wm::SHELF_ALIGNMENT_RIGHT);
 
   // Size panels in such a way that ordering them by X coordinate would cause
   // stacking order to be incorrect. Test that stacking order is based on Y.
   std::unique_ptr<aura::Window> w1(
       CreatePanelWindow(gfx::Rect(0, 0, 210, 201)));
   std::unique_ptr<aura::Window> w2(
       CreatePanelWindow(gfx::Rect(0, 0, 220, 201)));
   std::unique_ptr<aura::Window> w3(
       CreatePanelWindow(gfx::Rect(0, 0, 200, 201)));
 
@@ skipping 298 matching lines @@
   UpdateDisplay("600x400,600x400");
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
 
   std::unique_ptr<aura::Window> p1_d2(
       CreatePanelWindow(gfx::Rect(600, 0, 50, 50)));
   EXPECT_EQ(root_windows[1], p1_d2->GetRootWindow());
 
   IsPanelAboveLauncherIcon(p1_d2.get());
   IsCalloutAboveLauncherIcon(p1_d2.get());
 
-  SetAlignment(root_windows[1], SHELF_ALIGNMENT_RIGHT);
+  SetAlignment(root_windows[1], wm::SHELF_ALIGNMENT_RIGHT);
   IsPanelAboveLauncherIcon(p1_d2.get());
   IsCalloutAboveLauncherIcon(p1_d2.get());
-  SetAlignment(root_windows[1], SHELF_ALIGNMENT_LEFT);
+  SetAlignment(root_windows[1], wm::SHELF_ALIGNMENT_LEFT);
   IsPanelAboveLauncherIcon(p1_d2.get());
   IsCalloutAboveLauncherIcon(p1_d2.get());
 }
 
 TEST_F(PanelLayoutManagerTest, AlignmentLeft) {
   gfx::Rect bounds(0, 0, 201, 201);
   std::unique_ptr<aura::Window> w(CreatePanelWindow(bounds));
-  SetAlignment(Shell::GetPrimaryRootWindow(), SHELF_ALIGNMENT_LEFT);
+  SetAlignment(Shell::GetPrimaryRootWindow(), wm::SHELF_ALIGNMENT_LEFT);
   IsPanelAboveLauncherIcon(w.get());
   IsCalloutAboveLauncherIcon(w.get());
 }
 
 TEST_F(PanelLayoutManagerTest, AlignmentRight) {
   gfx::Rect bounds(0, 0, 201, 201);
   std::unique_ptr<aura::Window> w(CreatePanelWindow(bounds));
-  SetAlignment(Shell::GetPrimaryRootWindow(), SHELF_ALIGNMENT_RIGHT);
+  SetAlignment(Shell::GetPrimaryRootWindow(), wm::SHELF_ALIGNMENT_RIGHT);
   IsPanelAboveLauncherIcon(w.get());
   IsCalloutAboveLauncherIcon(w.get());
 }
 
 // Tests that panels will hide and restore their state with the shelf visibility
 // state. This ensures that entering full-screen mode will hide your panels
 // until you leave it.
 TEST_F(PanelLayoutManagerTest, PanelsHideAndRestoreWithShelf) {
   gfx::Rect bounds(0, 0, 201, 201);
 
@@ skipping 51 matching lines @@
   ui::EventTargeter* targeter = root->GetEventTargeter();
 
   // Note that the constants used in the touch locations below are
   // arbitrarily-selected small numbers which will ensure the point is
   // within the default extended region surrounding the panel. This value
   // is calculated as
   // kResizeOutsideBoundsSize * kResizeOutsideBoundsScaleForTouch
   // in src/ash/root_window_controller.cc.
 
   // Hit test outside the right edge with a bottom-aligned shelf.
-  SetAlignment(Shell::GetPrimaryRootWindow(), SHELF_ALIGNMENT_BOTTOM);
+  SetAlignment(Shell::GetPrimaryRootWindow(), wm::SHELF_ALIGNMENT_BOTTOM);
   gfx::Rect bounds(w->bounds());
   ui::TouchEvent touch(ui::ET_TOUCH_PRESSED,
                        gfx::Point(bounds.right() + 3, bounds.y() + 2),
                        0, ui::EventTimeForNow());
   ui::EventTarget* target = targeter->FindTargetForEvent(root, &touch);
   EXPECT_EQ(w.get(), target);
 
   // Hit test outside the bottom edge with a bottom-aligned shelf.
   touch.set_location(gfx::Point(bounds.x() + 6, bounds.bottom() + 5));
   target = targeter->FindTargetForEvent(root, &touch);
   EXPECT_NE(w.get(), target);
 
   // Hit test outside the bottom edge with a right-aligned shelf.
-  SetAlignment(Shell::GetPrimaryRootWindow(), SHELF_ALIGNMENT_RIGHT);
+  SetAlignment(Shell::GetPrimaryRootWindow(), wm::SHELF_ALIGNMENT_RIGHT);
   bounds = w->bounds();
   touch.set_location(gfx::Point(bounds.x() + 6, bounds.bottom() + 5));
   target = targeter->FindTargetForEvent(root, &touch);
   EXPECT_EQ(w.get(), target);
 
   // Hit test outside the right edge with a right-aligned shelf.
   touch.set_location(gfx::Point(bounds.right() + 3, bounds.y() + 2));
   target = targeter->FindTargetForEvent(root, &touch);
   EXPECT_NE(w.get(), target);
 
   // Hit test outside the top edge with a left-aligned shelf.
-  SetAlignment(Shell::GetPrimaryRootWindow(), SHELF_ALIGNMENT_LEFT);
+  SetAlignment(Shell::GetPrimaryRootWindow(), wm::SHELF_ALIGNMENT_LEFT);
   bounds = w->bounds();
   touch.set_location(gfx::Point(bounds.x() + 4, bounds.y() - 6));
   target = targeter->FindTargetForEvent(root, &touch);
   EXPECT_EQ(w.get(), target);
 
   // Hit test outside the left edge with a left-aligned shelf.
   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