Cleanup ash shelf accessor functions.

ash/shelf/overflow_bubble_view.cc

 // Copyright 2013 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/shelf/overflow_bubble_view.h"
 
 #include <algorithm>
 
 #include "ash/root_window_controller.h"
+#include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_constants.h"
-#include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_view.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ui/events/event.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 namespace {
 
 // Max bubble size to screen size ratio.
 const float kMaxBubbleSizeToScreenRatio = 0.5f;
 
 // Inner padding in pixels for shelf view inside bubble.
 const int kPadding = 2;
 
 // Padding space in pixels between ShelfView's left/top edge to its contents.
 const int kShelfViewLeadingInset = 8;
 
 }  // namespace
 
-OverflowBubbleView::OverflowBubbleView()
-    : shelf_view_(NULL) {
-}
+OverflowBubbleView::OverflowBubbleView() : shelf_view_(NULL) {}
 
-OverflowBubbleView::~OverflowBubbleView() {
-}
+OverflowBubbleView::~OverflowBubbleView() {}
 
 void OverflowBubbleView::InitOverflowBubble(views::View* anchor,
                                             ShelfView* shelf_view) {
   SetAnchorView(anchor);
   set_arrow(GetBubbleArrow());
   set_background(NULL);
   set_color(SkColorSetARGB(kShelfBackgroundAlpha, 0, 0, 0));
   set_margins(gfx::Insets(kPadding, kPadding, kPadding, kPadding));
   // Overflow bubble should not get focus. If it get focus when it is shown,
   // active state item is changed to running state.
   set_can_activate(false);
 
   // Makes bubble view has a layer and clip its children layers.
   SetPaintToLayer(true);
   SetFillsBoundsOpaquely(false);
   layer()->SetMasksToBounds(true);
 
   shelf_view_ = shelf_view;
   AddChildView(shelf_view_);
 
   set_parent_window(Shell::GetContainer(
       anchor->GetWidget()->GetNativeWindow()->GetRootWindow(),
       kShellWindowId_ShelfBubbleContainer));
   views::BubbleDelegateView::CreateBubble(this);
 }
 
 bool OverflowBubbleView::IsHorizontalAlignment() const {
-  ShelfLayoutManager* shelf_layout_manager = GetShelfLayoutManager();
-  return shelf_layout_manager ? shelf_layout_manager->IsHorizontalAlignment()
-                              : false;
+  return shelf_view_ ? shelf_view_->shelf()->IsHorizontalAlignment() : false;
 }
 
 const gfx::Size OverflowBubbleView::GetContentsSize() const {
   return static_cast<views::View*>(shelf_view_)->GetPreferredSize();
 }
 
 // Gets arrow location based on shelf alignment.
 views::BubbleBorder::Arrow OverflowBubbleView::GetBubbleArrow() const {
-  ShelfLayoutManager* shelf_layout_manager = GetShelfLayoutManager();
-  return shelf_layout_manager ?
-      shelf_layout_manager->SelectValueForShelfAlignment(
-          views::BubbleBorder::BOTTOM_LEFT,
-          views::BubbleBorder::LEFT_TOP,
-          views::BubbleBorder::RIGHT_TOP,
-          views::BubbleBorder::TOP_LEFT) :
-      views::BubbleBorder::NONE;
+  if (!shelf_view_)
+    return views::BubbleBorder::NONE;
+  return shelf_view_->shelf()->SelectValueForShelfAlignment(
+      views::BubbleBorder::BOTTOM_LEFT, views::BubbleBorder::LEFT_TOP,
+      views::BubbleBorder::RIGHT_TOP, views::BubbleBorder::TOP_LEFT);
 }
 
 void OverflowBubbleView::ScrollByXOffset(int x_offset) {
   const gfx::Rect visible_bounds(GetContentsBounds());
   const gfx::Size contents_size(GetContentsSize());
 
   DCHECK_GE(contents_size.width(), visible_bounds.width());
   int x = std::min(contents_size.width() - visible_bounds.width(),
                    std::max(0, scroll_offset_.x() + x_offset));
   scroll_offset_.set_x(x);
 }
 
 void OverflowBubbleView::ScrollByYOffset(int y_offset) {
   const gfx::Rect visible_bounds(GetContentsBounds());
   const gfx::Size contents_size(GetContentsSize());
 
   DCHECK_GE(contents_size.width(), visible_bounds.width());
   int y = std::min(contents_size.height() - visible_bounds.height(),
                    std::max(0, scroll_offset_.y() + y_offset));
   scroll_offset_.set_y(y);
 }
 
-ShelfLayoutManager* OverflowBubbleView::GetShelfLayoutManager() const {
-  return shelf_view_ ? shelf_view_->shelf_layout_manager() : nullptr;
-}
-
 gfx::Size OverflowBubbleView::GetPreferredSize() const {
   gfx::Size preferred_size = GetContentsSize();
 
   const gfx::Rect monitor_rect =
       gfx::Screen::GetScreen()
           ->GetDisplayNearestPoint(GetAnchorRect().CenterPoint())
           .work_area();
   if (!monitor_rect.IsEmpty()) {
     if (IsHorizontalAlignment()) {
       preferred_size.set_width(std::min(
@@ skipping 91 matching lines @@
 
     bubble_rect.Offset(0, offset);
     border->set_arrow_offset(anchor_rect.CenterPoint().y() - bubble_rect.y());
   }
 
   GetBubbleFrameView()->SchedulePaint();
   return bubble_rect;
 }
 
 }  // namespace ash