Commit b97f3b62 authored by junmin.zhu@intel.com's avatar junmin.zhu@intel.com

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
parent 67573fda
...@@ -51,6 +51,12 @@ gfx::Size ClientView::GetPreferredSize() { ...@@ -51,6 +51,12 @@ gfx::Size ClientView::GetPreferredSize() {
return contents_view_ ? contents_view_->GetPreferredSize() : gfx::Size(); 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() { gfx::Size ClientView::GetMinimumSize() {
// |contents_view_| is allowed to be NULL up until the point where this view // |contents_view_| is allowed to be NULL up until the point where this view
// is attached to a Container. // is attached to a Container.
......
...@@ -58,6 +58,7 @@ class VIEWS_EXPORT ClientView : public View { ...@@ -58,6 +58,7 @@ class VIEWS_EXPORT ClientView : public View {
// Overridden from View: // Overridden from View:
virtual gfx::Size GetPreferredSize() OVERRIDE; virtual gfx::Size GetPreferredSize() OVERRIDE;
virtual gfx::Size GetMaximumSize() OVERRIDE;
virtual gfx::Size GetMinimumSize() OVERRIDE; virtual gfx::Size GetMinimumSize() OVERRIDE;
virtual void Layout() OVERRIDE; virtual void Layout() OVERRIDE;
virtual std::string GetClassName() const OVERRIDE; virtual std::string GetClassName() const OVERRIDE;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment