Factor out [min|max]_size into ShellWindow::SizeConstraints

apps/shell_window.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef APPS_SHELL_WINDOW_H_
 #define APPS_SHELL_WINDOW_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/extensions/extension_icon_image.h"
@@ skipping 72 matching lines @@
     WINDOW_TYPE_PANEL    = 1 << 1,  // OS controlled panel window (Ash only).
     WINDOW_TYPE_V1_PANEL = 1 << 2,  // For apps v1 support in Ash; deprecate
                                     // with v1 apps.
   };
 
   enum Frame {
     FRAME_CHROME,  // Chrome-style window frame.
     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::Rect ClampBounds(const gfx::Rect& bounds) 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 minimum_size() const;
+    gfx::Size maximum_size() const;
+
+   private:
+    gfx::Size minimum_size_;
+    gfx::Size maximum_size_;
+  };
+
   struct CreateParams {
     CreateParams();
     ~CreateParams();
 
     WindowType window_type;
     Frame frame;
     bool transparent_background;  // Only supported on ash.
 
     // Specify the initial content bounds of the window (excluding any window
     // decorations). INT_MIN designates 'unspecified' for the position
@@ skipping 216 matching lines @@
   void AdjustBoundsToBeVisibleOnScreen(
       const gfx::Rect& cached_bounds,
       const gfx::Rect& cached_screen_bounds,
       const gfx::Rect& current_screen_bounds,
       const gfx::Size& minimum_size,
       gfx::Rect* bounds) const;
 
   // Load the app's image, firing a load state change when loaded.
   void UpdateExtensionAppIcon();
 
+  // Loads the appropriate default or cached window bounds and constraints them
+  // based on screen size and minimum/maximum size. Returns a new CreateParams
+  // that should be used to create the window.
+  CreateParams LoadDefaultsAndConstrain(

[tapted, 2013/10/14 05:13:43]

Hm.. the non-overrides are already mixed in with a bunch of overrides. Since
this is part of `Init`, and const, I feel stronger about it being at the top of
the private: section. Same argument applies for
`AdjustBoundsToBeVisibleOnScreen` though.

But really all the private non-virtuals should be at the start of the private:
section. The function order is all messed up in the .cc as well.

Ummm.. I'd suggest moving this to come after the existing
AdjustBoundsToBeVisibleOnScreen for now -- likewise in the .cc file so there's
not a static function mixed in. Then, things can be organised properly in a
follow-up (which would keep the two functions together still, just put them
somewhere more appropriate).

[jackhou1, 2013/10/14 23:45:32]

Done.

+      const CreateParams& create_params) const;
+
   // extensions::ExtensionKeybindingRegistry::Delegate implementation.
   virtual extensions::ActiveTabPermissionGranter*
       GetActiveTabPermissionGranter() OVERRIDE;
 
   // web_modal::WebContentsModalDialogManagerDelegate implementation.
   virtual web_modal::WebContentsModalDialogHost*
       GetWebContentsModalDialogHost() OVERRIDE;
 
   // Callback from web_contents()->DownloadFavicon.
   void DidDownloadFavicon(int id,
@@ skipping 36 matching lines @@
   base::WeakPtrFactory<ShellWindow> image_loader_ptr_factory_;
 
   // Fullscreen entered by app.window api.
   bool fullscreen_for_window_api_;
   // Fullscreen entered by HTML requestFullscreen.
   bool fullscreen_for_tab_;
 
   // The window content is visible.
   bool is_content_visible_;
 
+  // Size constraints on the window.
+  SizeConstraints size_constraints_;

[tapted, 2013/10/14 05:13:43]

maybe move this to the next CL

[jackhou1, 2013/10/14 23:45:32]

Done.

+
   DISALLOW_COPY_AND_ASSIGN(ShellWindow);
 };
 
 }  // namespace apps
 
 #endif  // APPS_SHELL_WINDOW_H_