| Index: ui/views/controls/scroll_view.cc
|
| diff --git a/ui/views/controls/scroll_view.cc b/ui/views/controls/scroll_view.cc
|
| index e9dbdac9fdd94cb6a246668d3329c8108b4b89e3..51e9ab72c3d3d76b615d35f3448d1b3c006233d7 100644
|
| --- a/ui/views/controls/scroll_view.cc
|
| +++ b/ui/views/controls/scroll_view.cc
|
| @@ -272,14 +272,16 @@ void ScrollView::SetVerticalScrollBar(ScrollBar* vert_sb) {
|
| }
|
|
|
| gfx::Size ScrollView::GetPreferredSize() const {
|
| - if (!is_bounded())
|
| - return View::GetPreferredSize();
|
| -
|
| gfx::Size size = contents()->GetPreferredSize();
|
| size.SetToMax(gfx::Size(size.width(), min_height_));
|
| size.SetToMin(gfx::Size(size.width(), max_height_));
|
| gfx::Insets insets = GetInsets();
|
| size.Enlarge(insets.width(), insets.height());
|
| +
|
| + // If not vertically bounded, there's no specific preferred height.
|
| + if (!is_bounded())
|
| + size.set_height(0);
|
| +
|
| return size;
|
| }
|
|
|
|
|