Cleanup ash shelf accessor functions.

ash/wm/app_list_controller.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/app_list_controller.h"
 
 #include "ash/ash_switches.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
 #include "ash/shelf/shelf.h"
@@ skipping 37 matching lines @@
 // The minimal margin (in pixels) around the app list when in centered mode.
 const int kMinimalCenteredAppListMargin = 10;
 
 ui::Layer* GetLayer(views::Widget* widget) {
   return widget->GetNativeView()->layer();
 }
 
 // Gets arrow location based on shelf alignment.
 views::BubbleBorder::Arrow GetBubbleArrow(aura::Window* window) {
   DCHECK(Shell::HasInstance());
-  return ShelfLayoutManager::ForShelf(window)->
-      SelectValueForShelfAlignment(
-          views::BubbleBorder::BOTTOM_CENTER,
-          views::BubbleBorder::LEFT_CENTER,
-          views::BubbleBorder::RIGHT_CENTER,
-          views::BubbleBorder::TOP_CENTER);
+  return Shelf::ForWindow(window)
+      ->shelf_layout_manager()
+      ->SelectValueForShelfAlignment(
+          views::BubbleBorder::BOTTOM_CENTER, views::BubbleBorder::LEFT_CENTER,
+          views::BubbleBorder::RIGHT_CENTER, views::BubbleBorder::TOP_CENTER);
 }
 
 // Offset given |rect| towards shelf.
 gfx::Rect OffsetTowardsShelf(const gfx::Rect& rect, views::Widget* widget) {
   DCHECK(Shell::HasInstance());
   ShelfAlignment shelf_alignment = Shell::GetInstance()->GetShelfAlignment(
       widget->GetNativeView()->GetRootWindow());
   gfx::Rect offseted(rect);
   switch (shelf_alignment) {
     case SHELF_ALIGNMENT_BOTTOM:
@@ skipping 482 matching lines @@
   } else if (should_snap_back_) {
     should_snap_back_ = false;
     ui::ScopedLayerAnimationSettings animation(widget_animator);
     animation.SetTransitionDuration(base::TimeDelta::FromMilliseconds(
         app_list::kOverscrollPageTransitionDurationMs));
     widget->SetBounds(view_bounds_);
   }
 }
 
 }  // namespace ash