ash: Move alignment and autohide behavior from Shelf to WmShelf

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/aura/wm_window_aura.h"
 #include "ash/common/ash_switches.h"
 #include "ash/common/shelf/app_list_button.h"
 #include "ash/common/shelf/shelf.h"
@@ skipping 26 matching lines @@
 namespace {
 
 // The minimal anchor position offset to make sure that the bubble is still on
 // the screen with 8 pixels spacing on the left / right. This constant is a
 // result of minimal bubble arrow sizes and offsets.
 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;
     case SHELF_ALIGNMENT_LEFT:
       return views::BubbleBorder::LEFT_CENTER;
     case SHELF_ALIGNMENT_RIGHT:
       return views::BubbleBorder::RIGHT_CENTER;
   }
   NOTREACHED();
   return views::BubbleBorder::BOTTOM_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 =
       Shelf::ForWindow(WmLookup::Get()->GetWindowForWidget(widget))
+          ->wm_shelf()
           ->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),
@@ skipping 175 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.
   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);
     case SHELF_ALIGNMENT_LEFT:
       return gfx::Vector2d(-kAnimationOffset, 0);
     case SHELF_ALIGNMENT_RIGHT:
       return gfx::Vector2d(kAnimationOffset, 0);
   }
   NOTREACHED();
   return gfx::Vector2d();
@@ skipping 82 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // AppListPresenterDelegate, WmShelfObserver implementation:
 
 void AppListPresenterDelegate::OnShelfIconPositionsChanged() {
   UpdateBounds();
 }
 
 }  // namespace ash