Prevent bookmarks bar toggling from decreasing window height to 0.

chrome/browser/ui/cocoa/browser_window_controller_unittest.mm

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2012 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 "base/mac/mac_util.h"
 #import "base/mac/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/app/chrome_command_ids.h"
@@ skipping 105 matching lines @@
   EXPECT_TRUE([controller_ isTabbedWindow]);
   EXPECT_TRUE([controller_ hasTabStrip]);
   EXPECT_FALSE([controller_ hasTitleBar]);
   EXPECT_TRUE([controller_ isBookmarkBarVisible]);
 
   // And make sure a controller for a pop-up window is not normal.
   // popup_browser will be owned by its window.
   Browser* popup_browser(new Browser(
       Browser::CreateParams(Browser::TYPE_POPUP, profile(),
                             chrome::GetActiveDesktop())));
-  NSWindow *cocoaWindow = popup_browser->window()->GetNativeWindow();
+  NSWindow* cocoaWindow = popup_browser->window()->GetNativeWindow();
   BrowserWindowController* controller =
       static_cast<BrowserWindowController*>([cocoaWindow windowController]);
   ASSERT_TRUE([controller isKindOfClass:[BrowserWindowController class]]);
   EXPECT_FALSE([controller isTabbedWindow]);
   EXPECT_FALSE([controller hasTabStrip]);
   EXPECT_TRUE([controller hasTitleBar]);
   EXPECT_FALSE([controller isBookmarkBarVisible]);
   [controller close];
 }
 
 TEST_F(BrowserWindowControllerTest, TestSetBounds) {
   // Create a normal browser with bounds smaller than the minimum.
   Browser::CreateParams params(Browser::TYPE_TABBED, profile(),
                                chrome::GetActiveDesktop());
   params.initial_bounds = gfx::Rect(0, 0, 50, 50);
   Browser* browser = new Browser(params);
-  NSWindow *cocoaWindow = browser->window()->GetNativeWindow();
+  NSWindow* cocoaWindow = browser->window()->GetNativeWindow();
   BrowserWindowController* controller =
     static_cast<BrowserWindowController*>([cocoaWindow windowController]);
 
   ASSERT_TRUE([controller isTabbedWindow]);
   BrowserWindow* browser_window = [controller browserWindow];
   EXPECT_EQ(browser_window, browser->window());
   gfx::Rect bounds = browser_window->GetBounds();
   EXPECT_EQ(400, bounds.width());
   EXPECT_EQ(272, bounds.height());
 
   // Try to set the bounds smaller than the minimum.
   browser_window->SetBounds(gfx::Rect(0, 0, 50, 50));
   bounds = browser_window->GetBounds();
   EXPECT_EQ(400, bounds.width());
   EXPECT_EQ(272, bounds.height());
 
   [controller close];
 }
 
 TEST_F(BrowserWindowControllerTest, TestSetBoundsPopup) {
   // Create a popup with bounds smaller than the minimum.
   Browser::CreateParams params(Browser::TYPE_POPUP, profile(),
                                chrome::GetActiveDesktop());
   params.initial_bounds = gfx::Rect(0, 0, 50, 50);
   Browser* browser = new Browser(params);
-  NSWindow *cocoaWindow = browser->window()->GetNativeWindow();
+  NSWindow* cocoaWindow = browser->window()->GetNativeWindow();
   BrowserWindowController* controller =
     static_cast<BrowserWindowController*>([cocoaWindow windowController]);
 
   ASSERT_FALSE([controller isTabbedWindow]);
   BrowserWindow* browser_window = [controller browserWindow];
   EXPECT_EQ(browser_window, browser->window());
   gfx::Rect bounds = browser_window->GetBounds();
   EXPECT_EQ(100, bounds.width());
   EXPECT_EQ(122, bounds.height());
 
@@ skipping 15 matching lines @@
 
   // Explicitly show the bar. Can't use chrome::ToggleBookmarkBarWhenVisible()
   // because of the notification issues.
   profile()->GetPrefs()->SetBoolean(bookmarks::prefs::kShowBookmarkBar, true);
 
   [controller_ browserWindow]->BookmarkBarStateChanged(
       BookmarkBar::DONT_ANIMATE_STATE_CHANGE);
   EXPECT_TRUE([controller_ isBookmarkBarVisible]);
 }
 
+TEST_F(BrowserWindowControllerTest, BookmarkBarToggleRespectMinWindowHeight) {
+  Browser::CreateParams params(Browser::TYPE_TABBED, profile(),
+                               chrome::GetActiveDesktop());
+  params.initial_bounds = gfx::Rect(0, 0, 50, 280);
+  Browser* browser = new Browser(params);
+  NSWindow* cocoaWindow = browser->window()->GetNativeWindow();
+  BrowserWindowController* controller =
+   static_cast<BrowserWindowController*>([cocoaWindow windowController]);
+  BrowserWindow* browser_window = [controller browserWindow];
+  gfx::Rect bounds = browser_window->GetBounds();
+  EXPECT_EQ(280, bounds.height());
+
+  // Try to set the bounds smaller than the minimum.
+  // Explicitly show the bar. Can't use chrome::ToggleBookmarkBarWhenVisible()
+  // because of the notification issues.
+  [controller adjustWindowHeightBy:-20];
+  bounds = browser_window->GetBounds();
+  EXPECT_EQ(272, bounds.height());
+
+  [controller close];
+}
+
 #if 0
 // TODO(jrg): This crashes trying to create the BookmarkBarController, adding
 // an observer to the BookmarkModel.
 TEST_F(BrowserWindowControllerTest, TestIncognitoWidthSpace) {
   scoped_ptr<TestingProfile> incognito_profile(new TestingProfile());
   incognito_profile->set_off_the_record(true);
   scoped_ptr<Browser> browser(
       new Browser(Browser::CreateParams(incognito_profile.get(),
                                         chrome::GetActiveDesktop()));
   controller_.reset([[BrowserWindowController alloc]
@@ skipping 88 matching lines @@
 }  // end namespace
 
 TEST_F(BrowserWindowControllerTest, TestAdjustWindowHeight) {
   NSWindow* window = [controller_ window];
   NSRect workarea = [[window screen] visibleFrame];
 
   // Place the window well above the bottom of the screen and try to adjust its
   // height. It should change appropriately (and only downwards). Then get it to
   // shrink by the same amount; it should return to its original state.
   NSRect initialFrame = NSMakeRect(workarea.origin.x, workarea.origin.y + 100,
-                                   200, 200);
+                                   200, 280);
   [window setFrame:initialFrame display:YES];
   [controller_ resetWindowGrowthState];
   [controller_ adjustWindowHeightBy:40];
   NSRect finalFrame = [window frame];
   EXPECT_FALSE(NSEqualRects(finalFrame, initialFrame));
   EXPECT_FLOAT_EQ(NSMaxY(finalFrame), NSMaxY(initialFrame));
   EXPECT_FLOAT_EQ(NSHeight(finalFrame), NSHeight(initialFrame) + 40);
   [controller_ adjustWindowHeightBy:-40];
   finalFrame = [window frame];
   EXPECT_FLOAT_EQ(NSMaxY(finalFrame), NSMaxY(initialFrame));
   EXPECT_FLOAT_EQ(NSHeight(finalFrame), NSHeight(initialFrame));
 
   // Place the window at the bottom of the screen and try again.  Its height
   // should still change, but it should not grow down below the work area; it
   // should instead move upwards. Then shrink it and make sure it goes back to
   // the way it was.
-  initialFrame = NSMakeRect(workarea.origin.x, workarea.origin.y, 200, 200);
+  initialFrame = NSMakeRect(workarea.origin.x, workarea.origin.y, 200, 280);
   [window setFrame:initialFrame display:YES];
   [controller_ resetWindowGrowthState];
   [controller_ adjustWindowHeightBy:40];
   finalFrame = [window frame];
   EXPECT_FALSE(NSEqualRects(finalFrame, initialFrame));
   EXPECT_FLOAT_EQ(NSMinY(finalFrame), NSMinY(initialFrame));
   EXPECT_FLOAT_EQ(NSHeight(finalFrame), NSHeight(initialFrame) + 40);
   [controller_ adjustWindowHeightBy:-40];
   finalFrame = [window frame];
   EXPECT_FLOAT_EQ(NSMinY(finalFrame), NSMinY(initialFrame));
   EXPECT_FLOAT_EQ(NSHeight(finalFrame), NSHeight(initialFrame));
 
   // Put the window slightly offscreen and try again.  The height should not
   // change this time.
-  initialFrame = NSMakeRect(workarea.origin.x - 10, 0, 200, 200);
+  initialFrame = NSMakeRect(workarea.origin.x - 10, 0, 200, 280);
   [window setFrame:initialFrame display:YES];
   [controller_ resetWindowGrowthState];
   [controller_ adjustWindowHeightBy:40];
   EXPECT_TRUE(NSEqualRects([window frame], initialFrame));
   [controller_ adjustWindowHeightBy:-40];
   EXPECT_TRUE(NSEqualRects([window frame], initialFrame));
 
   // Make the window the same size as the workarea.  Resizing both larger and
   // smaller should have no effect.
   [window setFrame:workarea display:YES];
   [controller_ resetWindowGrowthState];
   [controller_ adjustWindowHeightBy:40];
   EXPECT_TRUE(NSEqualRects([window frame], workarea));
   [controller_ adjustWindowHeightBy:-40];
   EXPECT_TRUE(NSEqualRects([window frame], workarea));
 
   // Make the window smaller than the workarea and place it near the bottom of
   // the workarea.  The window should grow down until it hits the bottom and
   // then continue to grow up. Then shrink it, and it should return to where it
   // was.
   initialFrame = NSMakeRect(workarea.origin.x, workarea.origin.y + 5,
-                            200, 200);
+                            200, 280);
   [window setFrame:initialFrame display:YES];
   [controller_ resetWindowGrowthState];
   [controller_ adjustWindowHeightBy:40];
   finalFrame = [window frame];
   EXPECT_FLOAT_EQ(NSMinY(workarea), NSMinY(finalFrame));
   EXPECT_FLOAT_EQ(NSHeight(finalFrame), NSHeight(initialFrame) + 40);
   [controller_ adjustWindowHeightBy:-40];
   finalFrame = [window frame];
   EXPECT_FLOAT_EQ(NSMinY(initialFrame), NSMinY(finalFrame));
   EXPECT_FLOAT_EQ(NSHeight(initialFrame), NSHeight(finalFrame));
 
   // Inset the window slightly from the workarea.  It should not grow to be
   // larger than the workarea. Shrink it; it should return to where it started.
   initialFrame = NSInsetRect(workarea, 0, 5);
   [window setFrame:initialFrame display:YES];
   [controller_ resetWindowGrowthState];
   [controller_ adjustWindowHeightBy:40];
   finalFrame = [window frame];
   EXPECT_FLOAT_EQ(NSMinY(workarea), NSMinY(finalFrame));
   EXPECT_FLOAT_EQ(NSHeight(workarea), NSHeight(finalFrame));
   [controller_ adjustWindowHeightBy:-40];
   finalFrame = [window frame];
   EXPECT_FLOAT_EQ(NSMinY(initialFrame), NSMinY(finalFrame));
   EXPECT_FLOAT_EQ(NSHeight(initialFrame), NSHeight(finalFrame));
 
   // Place the window at the bottom of the screen and grow; it should grow
   // upwards. Move the window off the bottom, then shrink. It should then shrink
   // from the bottom.
-  initialFrame = NSMakeRect(workarea.origin.x, workarea.origin.y, 200, 200);
+  initialFrame = NSMakeRect(workarea.origin.x, workarea.origin.y, 200, 280);
   [window setFrame:initialFrame display:YES];
   [controller_ resetWindowGrowthState];
   [controller_ adjustWindowHeightBy:40];
   finalFrame = [window frame];
   EXPECT_FALSE(NSEqualRects(finalFrame, initialFrame));
   EXPECT_FLOAT_EQ(NSMinY(finalFrame), NSMinY(initialFrame));
   EXPECT_FLOAT_EQ(NSHeight(finalFrame), NSHeight(initialFrame) + 40);
   NSPoint oldOrigin = initialFrame.origin;
   NSPoint newOrigin = NSMakePoint(oldOrigin.x, oldOrigin.y + 10);
   [window setFrameOrigin:newOrigin];
@@ skipping 293 matching lines @@
     [controller_ close];
     CocoaProfileTest::TearDown();
   }
 
  public:
   BrowserWindowController* controller_;
 };
 
 // Check if the window is front most or if one of its child windows (such
 // as a status bubble) is front most.
-static bool IsFrontWindow(NSWindow *window) {
+static bool IsFrontWindow(NSWindow* window) {
   NSWindow* frontmostWindow = [[NSApp orderedWindows] objectAtIndex:0];
   return [frontmostWindow isEqual:window] ||
          [[frontmostWindow parentWindow] isEqual:window];
 }
 
 void WaitForFullScreenTransition() {
   content::WindowedNotificationObserver observer(
       chrome::NOTIFICATION_FULLSCREEN_CHANGED,
       content::NotificationService::AllSources());
   observer.Wait();
@@ skipping 53 matching lines @@
       [[NSWindow alloc] initWithContentRect:NSMakeRect(0,0,400,400)
                                   styleMask:NSBorderlessWindowMask
                                     backing:NSBackingStoreBuffered
                                       defer:NO]);
   [[testFullscreenWindow_ contentView] setWantsLayer:YES];
   return testFullscreenWindow_.get();
 }
 @end
 
 /* TODO(???): test other methods of BrowserWindowController */