Allow platform apps to specify a maximum size for the shell container.

chrome/common/extensions/extension.h

Index: chrome/common/extensions/extension.h
diff --git a/chrome/common/extensions/extension.h b/chrome/common/extensions/extension.h
index fd224f2248760fcbf959be6938f53ff62198b36c..0f789ebbfaa96c75e0a350387bbf46de5cf38558 100644
--- a/chrome/common/extensions/extension.h
+++ b/chrome/common/extensions/extension.h
@@ -611,13 +611,21 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
     return launch_container_;
   }
   int launch_width() const {
-    return std::max(launch_min_width_, launch_width_);
+    return std::max(launch_min_width_,
+                    launch_max_width_ ?
+                        std::min(launch_max_width_, launch_width_) :
+                        launch_width_);
   }
   int launch_height() const {
-    return std::max(launch_min_height_, launch_height_);
+    return std::max(launch_min_height_,
+                    launch_max_height_ ?
+                        std::min(launch_max_height_, launch_height_) :
+                        launch_height_);
   }
   int launch_min_width() const { return launch_min_width_; }
   int launch_min_height() const { return launch_min_height_; }
+  int launch_max_width() const { return launch_max_width_; }
+  int launch_max_height() const { return launch_max_height_; }
 
   // Theme-related.
   bool is_theme() const;
@@ -914,9 +922,12 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
   int launch_width_;
   int launch_height_;
 
-  // The minimum size of the container. Only respected for the shell container.
+  // The minimum and maximum size of the container. Only respected for the
+  // shell container.
   int launch_min_width_;
   int launch_min_height_;
+  int launch_max_width_;
+  int launch_max_height_;
 
   // The Omnibox keyword for this extension, or empty if there is none.
   std::string omnibox_keyword_;