| Index: ui/views/controls/scroll_view.cc
|
| diff --git a/ui/views/controls/scroll_view.cc b/ui/views/controls/scroll_view.cc
|
| index 68ee68fee3eaa8561e097be266a8ec202f448155..daeab4fac3b81a88fe21811375c59d3fe501db24 100644
|
| --- a/ui/views/controls/scroll_view.cc
|
| +++ b/ui/views/controls/scroll_view.cc
|
| @@ -272,12 +272,11 @@ 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_));
|
| + if (is_bounded()) {
|
| + 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());
|
| return size;
|
|
|