ash: Move alignment and autohide behavior from Shelf to WmShelf

ash/app_list/app_list_presenter_delegate.cc

Index: ash/app_list/app_list_presenter_delegate.cc
diff --git a/ash/app_list/app_list_presenter_delegate.cc b/ash/app_list/app_list_presenter_delegate.cc
index 0bd692dd850906b7178db451fca4771d89fc4244..c7e8c91b1ecc46e0a449749b00c031588dec679b 100644
--- a/ash/app_list/app_list_presenter_delegate.cc
+++ b/ash/app_list/app_list_presenter_delegate.cc
@@ -44,7 +44,8 @@ const int kMinimalAnchorPositionOffset = 57;
 // Gets arrow location based on shelf alignment.
 views::BubbleBorder::Arrow GetBubbleArrow(aura::Window* window) {
   DCHECK(Shell::HasInstance());
-  switch (Shelf::ForWindow(WmWindowAura::Get(window))->alignment()) {
+  WmShelf* shelf = Shelf::ForWindow(WmWindowAura::Get(window))->wm_shelf();
+  switch (shelf->alignment()) {
     case SHELF_ALIGNMENT_BOTTOM:
     case SHELF_ALIGNMENT_BOTTOM_LOCKED:
       return views::BubbleBorder::BOTTOM_CENTER;
@@ -64,6 +65,7 @@ gfx::Vector2d GetAnchorPositionOffsetToShelf(const gfx::Rect& button_bounds,
   DCHECK(Shell::HasInstance());
   ShelfAlignment shelf_alignment =
       Shelf::ForWindow(WmLookup::Get()->GetWindowForWidget(widget))
+          ->wm_shelf()
           ->alignment();
   gfx::Point anchor(button_bounds.CenterPoint());
   switch (shelf_alignment) {
@@ -259,7 +261,7 @@ gfx::Vector2d AppListPresenterDelegate::GetVisibilityAnimationOffset(
   Shelf* shelf = Shelf::ForWindow(WmWindowAura::Get(root_window));
   shelf->shelf_layout_manager()->UpdateAutoHideState();
 
-  switch (shelf->alignment()) {
+  switch (shelf->wm_shelf()->alignment()) {
     case SHELF_ALIGNMENT_BOTTOM:
     case SHELF_ALIGNMENT_BOTTOM_LOCKED:
       return gfx::Vector2d(0, kAnimationOffset);