Index: ash/shelf/overflow_bubble_view.cc |
diff --git a/ash/shelf/overflow_bubble_view.cc b/ash/shelf/overflow_bubble_view.cc |
index 5273e50684bdde0e6c1e5342a97d60b663a4927c..b15f7b73987d2f97e1a7f55984cb1031852db07f 100644 |
--- a/ash/shelf/overflow_bubble_view.cc |
+++ b/ash/shelf/overflow_bubble_view.cc |
@@ -41,8 +41,6 @@ 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); |
@@ -108,6 +106,10 @@ void OverflowBubbleView::ScrollByYOffset(int 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(); |
@@ -164,12 +166,6 @@ bool OverflowBubbleView::OnMouseWheel(const ui::MouseWheelEvent& event) { |
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()); |