Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(538)

Unified Diff: ui/views/window/client_view.cc

Issue 10802028: maxHeight/Width and miniHeight/Width of chrome.appWindow API failed in ShellWindow. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: rebase to trunk according to jeremya's comment. Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/window/client_view.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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.
« no previous file with comments | « ui/views/window/client_view.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698