Enforce different min size for popups than tabbed browsers on MacOSX.

chrome/browser/ui/cocoa/browser_window_controller.mm

 // Copyright (c) 2011 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.
 
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 
 #include <Carbon/Carbon.h>
 
 #include "app/mac/scoped_nsdisable_screen_updates.h"
 #include "app/mac/nsimage_cache.h"
@@ skipping 256 matching lines @@
     // prevents the browser from being able to quit <http://crbug.com/79113>.
     if ([window respondsToSelector:@selector(setRestorable:)])
       [window setRestorable:NO];
 
     // Get the most appropriate size for the window, then enforce the
     // minimum width and height. The window shim will handle flipping
     // the coordinates for us so we can use it to save some code.
     // Note that this may leave a significant portion of the window
     // offscreen, but there will always be enough window onscreen to
     // drag the whole window back into view.
-    NSSize minSize = [[self window] minSize];
     gfx::Rect desiredContentRect = browser_->GetSavedWindowBounds();
     gfx::Rect windowRect = desiredContentRect;
-    if (windowRect.width() < minSize.width)
-      windowRect.set_width(minSize.width);
-    if (windowRect.height() < minSize.height)
-      windowRect.set_height(minSize.height);
+    windowRect = [self enforceMinWindowSize:windowRect];
 
     // When we are given x/y coordinates of 0 on a created popup window, assume
     // none were given by the window.open() command.
     if ((browser_->is_type_popup() || browser_->is_type_panel()) &&
          windowRect.x() == 0 && windowRect.y() == 0) {
       gfx::Size size = windowRect.size();
       windowRect.set_origin(WindowSizer::GetDefaultPopupOrigin(size));
     }
 
     // Size and position the window.  Note that it is not yet onscreen.  Popup
@@ skipping 137 matching lines @@
       [fullscreenButton setAction:@selector(enterFullscreen:)];
       [fullscreenButton setTarget:self];
     }
 
     // We are done initializing now.
     initializing_ = NO;
   }
   return self;
 }
 
+- (void)awakeFromNib {
+  // Set different minimum sizes on tabbed windows vs non-tabbed, e.g. popups.
+  NSSize minSize = [self isTabbedWindow] ?
+      NSMakeSize(400, 272) : NSMakeSize(100, 122);
+  [[self window] setMinSize:minSize];
+}
+
 - (void)dealloc {
   browser_->CloseAllTabs();
   [downloadShelfController_ exiting];
 
   // Explicitly release |fullscreenController_| here, as it may call back to
   // this BWC in |-dealloc|.  We are required to call |-exitFullscreen| before
   // releasing the controller.
   [fullscreenController_ exitFullscreen];
   fullscreenController_.reset();
 
   // Under certain testing configurations we may not actually own the browser.
   if (ownsBrowser_ == NO)
     ignore_result(browser_.release());
 
   [[NSNotificationCenter defaultCenter] removeObserver:self];
 
   [super dealloc];
 }
 
+- (gfx::Rect)enforceMinWindowSize:(gfx::Rect)bounds {
+  gfx::Rect checkedBounds = bounds;
+
+  NSSize minSize = [[self window] minSize];
+  if (bounds.width() < minSize.width)
+      checkedBounds.set_width(minSize.width);
+  if (bounds.height() < minSize.height)
+      checkedBounds.set_height(minSize.height);
+
+  return checkedBounds;
+}
+
 - (BrowserWindow*)browserWindow {
   return windowShim_.get();
 }
 
 - (ToolbarController*)toolbarController {
   return toolbarController_.get();
 }
 
 - (TabStripController*)tabStripController {
   return tabStripController_.get();
@@ skipping 1727 matching lines @@
 
 - (BOOL)supportsBookmarkBar {
   return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR];
 }
 
 - (BOOL)isTabbedWindow {
   return browser_->is_type_tabbed();
 }
 
 @end  // @implementation BrowserWindowController(WindowType)