Index: views/widget/widget.cc |
diff --git a/views/widget/widget.cc b/views/widget/widget.cc |
index 8baf11c383d8c0a8c3dae552904402a0dc15f56c..b8377722b77e9c1453ec69ecbf84de71c1fdf45c 100644 |
--- a/views/widget/widget.cc |
+++ b/views/widget/widget.cc |
@@ -904,7 +904,7 @@ void Widget::OnNativeWidgetDestroyed() { |
} |
gfx::Size Widget::GetMinimumSize() { |
- return non_client_view_ ? non_client_view_->GetMinimumSize() : gfx::Size(); |
+ return non_client_view_ ? non_client_view_->GetMinimumSize() : minimum_size_; |
} |
void Widget::OnNativeWidgetSizeChanged(const gfx::Size& new_size) { |
@@ -1160,12 +1160,13 @@ bool Widget::GetSavedWindowPlacement(gfx::Rect* bounds, |
if (!widget_delegate_->ShouldRestoreWindowSize()) { |
bounds->set_size(non_client_view_->GetPreferredSize()); |
} else { |
+ gfx::Size minimum_size = GetMinimumSize(); |
// Make sure the bounds are at least the minimum size. |
- if (bounds->width() < minimum_size_.width()) |
- bounds->set_width(minimum_size_.width()); |
+ if (bounds->width() < minimum_size.width()) |
+ bounds->set_width(minimum_size.width()); |
- if (bounds->height() < minimum_size_.height()) |
- bounds->set_height(minimum_size_.height()); |
+ if (bounds->height() < minimum_size.height()) |
+ bounds->set_height(minimum_size.height()); |
} |
return true; |
} |