Index: ui/views/window/client_view.cc |
diff --git a/ui/views/window/client_view.cc b/ui/views/window/client_view.cc |
index 2d2f26a02d7bd41465628cb91d80a9576942a5d2..6f319724af1aec4a2a49d3c67f7f09c996081a74 100644 |
--- a/ui/views/window/client_view.cc |
+++ b/ui/views/window/client_view.cc |
@@ -51,6 +51,13 @@ gfx::Size ClientView::GetPreferredSize() { |
return contents_view_ ? contents_view_->GetPreferredSize() : gfx::Size(); |
} |
+gfx::Size ClientView::GetMaximumSize() { |
+ // |contents_view_| is allowed to be NULL up until the point where this view |
+ // is attached to a Container. |
+ return contents_view_ ? |
+ contents_view_->GetMaximumSize() : View::GetMaximumSize(); |
jeremya
2012/07/31 06:59:53
Why return View::GetMaximumSize() here rather than
|
+} |
+ |
gfx::Size ClientView::GetMinimumSize() { |
// |contents_view_| is allowed to be NULL up until the point where this view |
// is attached to a Container. |