(Merge to M-51) Revise the shelf alignment locking mechanism.

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 122 matching lines @@
       // 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());
     }
 
-    switch (alignment) {
-      case SHELF_ALIGNMENT_BOTTOM:
-        EXPECT_EQ(shelf_bounds.y(), window_bounds.bottom());
-        break;
-      case SHELF_ALIGNMENT_LEFT:
-        EXPECT_EQ(shelf_bounds.right(), window_bounds.x());
-        break;
-      case SHELF_ALIGNMENT_RIGHT:
-        EXPECT_EQ(shelf_bounds.x(), window_bounds.right());
-        break;
-    }
+    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);
 
     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());
-    switch (alignment) {
-      case SHELF_ALIGNMENT_BOTTOM:
-        EXPECT_EQ(panel_bounds.bottom(), callout_bounds.y());
-        break;
-      case SHELF_ALIGNMENT_LEFT:
-        EXPECT_EQ(panel_bounds.x(), callout_bounds.right());
-        break;
-      case SHELF_ALIGNMENT_RIGHT:
-        EXPECT_EQ(panel_bounds.right(), callout_bounds.x());
-        break;
-    }
+    if (alignment == SHELF_ALIGNMENT_LEFT)
+      EXPECT_EQ(panel_bounds.x(), callout_bounds.right());
+    else if (alignment == 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(),
                   widget->GetWindowBoundsInScreen().CenterPoint().y(),
                   1);
     }
@@ skipping 19 matching lines @@
     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) {
-    ash::Shell* shell = ash::Shell::GetInstance();
-    shell->SetShelfAlignment(alignment, root_window);
+    Shelf::ForWindow(root_window)->SetAlignment(alignment);
   }
 
   ShelfAlignment GetAlignment(const aura::Window* root_window) {
-    ash::Shell* shell = ash::Shell::GetInstance();
-    return shell->GetShelfAlignment(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();
   }
 
@@ skipping 584 matching lines @@
   // 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