diff options
| author | junmin.zhu@intel.com <junmin.zhu@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-31 17:57:43 +0000 |
|---|---|---|
| committer | junmin.zhu@intel.com <junmin.zhu@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-31 17:57:43 +0000 |
| commit | b97f3b62cd1370dc0dfdb4cc1ffc96e19eded547 (patch) | |
| tree | 545d5fc5685fddd8fa4999fbd84fc3f9bbb9bd13 /ui | |
| parent | 67573fda53a8232cbaf2db2b31de63626f8f4eae (diff) | |
| download | chromium_src-b97f3b62cd1370dc0dfdb4cc1ffc96e19eded547.zip chromium_src-b97f3b62cd1370dc0dfdb4cc1ffc96e19eded547.tar.gz chromium_src-b97f3b62cd1370dc0dfdb4cc1ffc96e19eded547.tar.bz2 | |
maxHeight/Width and miniHeight/Width of chrome.appWindow API failed in ShellWindow.
BUG=138001
TEST=manually
Review URL: https://chromiumcodereview.appspot.com/10802028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149219 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/views/window/client_view.cc | 6 | ||||
| -rw-r--r-- | ui/views/window/client_view.h | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/ui/views/window/client_view.cc b/ui/views/window/client_view.cc index 2d2f26a..86044c2 100644 --- a/ui/views/window/client_view.cc +++ b/ui/views/window/client_view.cc @@ -51,6 +51,12 @@ 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() : gfx::Size(); +} + gfx::Size ClientView::GetMinimumSize() { // |contents_view_| is allowed to be NULL up until the point where this view // is attached to a Container. diff --git a/ui/views/window/client_view.h b/ui/views/window/client_view.h index 99bd430..a6c8236 100644 --- a/ui/views/window/client_view.h +++ b/ui/views/window/client_view.h @@ -58,6 +58,7 @@ class VIEWS_EXPORT ClientView : public View { // Overridden from View: virtual gfx::Size GetPreferredSize() OVERRIDE; + virtual gfx::Size GetMaximumSize() OVERRIDE; virtual gfx::Size GetMinimumSize() OVERRIDE; virtual void Layout() OVERRIDE; virtual std::string GetClassName() const OVERRIDE; |