ash: Explicitly teach various components about ShelfLayoutManager.

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_constants.h"
@@ skipping 23 matching lines @@
 
 OverflowBubbleView::OverflowBubbleView()
     : shelf_view_(NULL) {
 }
 
 OverflowBubbleView::~OverflowBubbleView() {
 }
 
 void OverflowBubbleView::InitOverflowBubble(views::View* anchor,
                                             ShelfView* shelf_view) {
-  // set_anchor_view needs to be called before GetShelfLayoutManager() can be
-  // called.
   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();
+  ShelfLayoutManager* shelf_layout_manager =
+      shelf_view_ ? shelf_view_->shelf_layout_manager() : nullptr;
   return shelf_layout_manager ? shelf_layout_manager->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();
+  ShelfLayoutManager* shelf_layout_manager =

[sky, 2016/02/03 00:01:42]

nit: keep GetShelfLayoutManager but makes it implementation like you have here
(as it's called more than once).

[sadrul, 2016/02/03 02:07:58]

Done.

+      shelf_view_ ? shelf_view_->shelf_layout_manager() : nullptr;
   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;
 }
 
 void OverflowBubbleView::ScrollByXOffset(int x_offset) {
@@ skipping 65 matching lines @@
   // directions as in OverflowBubbleView::OnScrollEvent.
   if (IsHorizontalAlignment())
     ScrollByXOffset(-event.y_offset());
   else
     ScrollByYOffset(-event.y_offset());
   Layout();
 
   return true;
 }
 
-ShelfLayoutManager* OverflowBubbleView::GetShelfLayoutManager() const {
-  return GetAnchorView() ? ShelfLayoutManager::ForShelf(
-                               GetAnchorView()->GetWidget()->GetNativeView())
-                         : NULL;
-}
-
 void OverflowBubbleView::OnScrollEvent(ui::ScrollEvent* event) {
   ScrollByXOffset(-event->x_offset());
   ScrollByYOffset(-event->y_offset());
   Layout();
   event->SetHandled();
 }
 
 gfx::Rect OverflowBubbleView::GetBubbleBounds() {
   views::BubbleBorder* border = GetBubbleFrameView()->bubble_border();
   gfx::Insets bubble_insets = border->GetInsets();
@@ skipping 35 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