diff options
author | dmikurube@chromium.org <dmikurube@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-15 08:50:36 +0000 |
---|---|---|
committer | dmikurube@chromium.org <dmikurube@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-15 08:50:36 +0000 |
commit | 8a3451297dfd57b2884e79f2e1ebb62f96b2a2c2 (patch) | |
tree | f0e59ff5f45709fa0cd63d71a287d0f275494f06 /apps/shell_window.h | |
parent | 20d38a6329cc1bb7297a01d84ba9f495de600ad7 (diff) | |
download | chromium_src-8a3451297dfd57b2884e79f2e1ebb62f96b2a2c2.zip chromium_src-8a3451297dfd57b2884e79f2e1ebb62f96b2a2c2.tar.gz chromium_src-8a3451297dfd57b2884e79f2e1ebb62f96b2a2c2.tar.bz2 |
Revert 228654 "Factor out [min|max]_size into ShellWindow::SizeC..."
> Factor out [min|max]_size into ShellWindow::SizeConstraints
>
> This encapsulates the logic for managing window size constraints.
>
> BUG=305477
>
> Review URL: https://codereview.chromium.org/26751003
TBR=jackhou@chromium.org
Review URL: https://codereview.chromium.org/27311003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@228656 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps/shell_window.h')
-rw-r--r-- | apps/shell_window.h | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/apps/shell_window.h b/apps/shell_window.h index c873ecc..aee0cc5 100644 --- a/apps/shell_window.h +++ b/apps/shell_window.h @@ -90,37 +90,6 @@ class ShellWindow : public content::NotificationObserver, FRAME_NONE, // Frameless window. }; - class SizeConstraints { - public: - // The value SizeConstraints uses to represent an unbounded width or height. - static const int kUnboundedSize = 0; - - SizeConstraints(); - SizeConstraints(const gfx::Size& min_size, const gfx::Size& max_size); - ~SizeConstraints(); - - // Returns the bounds with its size clamped to the min/max size. - gfx::Size ClampSize(gfx::Size size) const; - - // When gfx::Size is used as a min/max size, a zero represents an unbounded - // component. This method checks whether either component is specified. - // Note we can't use gfx::Size::IsEmpty as it returns true if either width - // or height is zero. - bool HasMinimumSize() const; - bool HasMaximumSize() const; - - // This returns true if all components are specified, and min and max are - // equal. - bool HasFixedSize() const; - - gfx::Size GetMaximumSize() const; - gfx::Size GetMinimumSize() const; - - private: - gfx::Size minimum_size_; - gfx::Size maximum_size_; - }; - struct CreateParams { CreateParams(); ~CreateParams(); @@ -358,11 +327,6 @@ class ShellWindow : public content::NotificationObserver, const gfx::Size& minimum_size, gfx::Rect* bounds) const; - // Loads the appropriate default or cached window bounds and constrains them - // based on screen size and minimum/maximum size. Returns a new CreateParams - // that should be used to create the window. - CreateParams LoadDefaultsAndConstrain(CreateParams params) const; - // Load the app's image, firing a load state change when loaded. void UpdateExtensionAppIcon(); |