Revise the shelf alignment locking mechanism.

ash/app_list/app_list_presenter_delegate.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/app_list/app_list_presenter_delegate.h"
 
 #include "ash/app_list/app_list_view_delegate_factory.h"
 #include "ash/ash_switches.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
@@ skipping 33 matching lines @@
   return Shelf::ForWindow(window)->SelectValueForShelfAlignment(
       views::BubbleBorder::BOTTOM_CENTER, views::BubbleBorder::LEFT_CENTER,
       views::BubbleBorder::RIGHT_CENTER);
 }
 
 // Using |button_bounds|, determine the anchor offset so that the bubble gets
 // shown above the shelf (used for the alternate shelf theme).
 gfx::Vector2d GetAnchorPositionOffsetToShelf(const gfx::Rect& button_bounds,
                                              views::Widget* widget) {
   DCHECK(Shell::HasInstance());
-  ShelfAlignment shelf_alignment = Shell::GetInstance()->GetShelfAlignment(
-      widget->GetNativeView()->GetRootWindow());
+  ShelfAlignment shelf_alignment =
+      Shelf::ForWindow(widget->GetNativeView()->GetRootWindow())->alignment();
   gfx::Point anchor(button_bounds.CenterPoint());
   switch (shelf_alignment) {
     case SHELF_ALIGNMENT_BOTTOM:
+    case SHELF_ALIGNMENT_BOTTOM_LOCKED:
       if (base::i18n::IsRTL()) {
         int screen_width = widget->GetWorkAreaBoundsInScreen().width();
         return gfx::Vector2d(
             std::min(screen_width - kMinimalAnchorPositionOffset - anchor.x(),
                      0),
             0);
       }
       return gfx::Vector2d(
           std::max(kMinimalAnchorPositionOffset - anchor.x(), 0), 0);
     case SHELF_ALIGNMENT_LEFT:
@@ skipping 177 matching lines @@
 gfx::Vector2d AppListPresenterDelegate::GetVisibilityAnimationOffset(
     aura::Window* root_window) {
   DCHECK(Shell::HasInstance());
 
   // App list needs to know the new shelf layout in order to calculate its
   // UI layout when AppListView visibility changes.
   Shell::GetPrimaryRootWindowController()
       ->GetShelfLayoutManager()
       ->UpdateAutoHideState();
 
-  ShelfAlignment shelf_alignment =
-      Shell::GetInstance()->GetShelfAlignment(root_window);
-  switch (shelf_alignment) {
-    case SHELF_ALIGNMENT_BOTTOM:
-      return gfx::Vector2d(0, kAnimationOffset);
-    case SHELF_ALIGNMENT_LEFT:
-      return gfx::Vector2d(-kAnimationOffset, 0);
-    case SHELF_ALIGNMENT_RIGHT:
-      return gfx::Vector2d(kAnimationOffset, 0);
-  }
-  NOTREACHED();
-  return gfx::Vector2d();
+  return Shelf::ForWindow(root_window)
+      ->SelectValueForShelfAlignment(gfx::Vector2d(0, kAnimationOffset),
+                                     gfx::Vector2d(-kAnimationOffset, 0),
+                                     gfx::Vector2d(kAnimationOffset, 0));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // AppListPresenterDelegate, private:
 
 void AppListPresenterDelegate::ProcessLocatedEvent(ui::LocatedEvent* event) {
   if (!view_ || !is_visible_)
     return;
 
   // If the event happened on a menu, then the event should not close the app
@@ skipping 68 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // AppListPresenterDelegate, ShelfIconObserver implementation:
 
 void AppListPresenterDelegate::OnShelfIconPositionsChanged() {
   UpdateBounds();
 }
 
 }  // namespace ash