| Index: ash/shelf/shelf_view.h
|
| diff --git a/ash/shelf/shelf_view.h b/ash/shelf/shelf_view.h
|
| index 87993e0949c4d6febe64282335bd16edf07627a7..501b82a335d725739d0d232a4424046de281f2b8 100644
|
| --- a/ash/shelf/shelf_view.h
|
| +++ b/ash/shelf/shelf_view.h
|
| @@ -281,7 +281,7 @@ class ASH_EXPORT ShelfView : public views::View,
|
| void UpdateOverflowRange(ShelfView* overflow_view) const;
|
|
|
| // Overridden from views::View:
|
| - gfx::Size GetPreferredSize() const override;
|
| + gfx::Size CalculatePreferredSize() const override;
|
| void OnBoundsChanged(const gfx::Rect& previous_bounds) override;
|
| FocusTraversable* GetPaneFocusTraversable() override;
|
| void GetAccessibleNodeData(ui::AXNodeData* node_data) override;
|
|
|