mac: Refactor browser_window_controller layout logic.

chrome/browser/ui/cocoa/browser_window_controller_unittest.mm

 // Copyright (c) 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"
@@ skipping 231 matching lines @@
 namespace {
 
 // Verifies that the toolbar, infobar, tab content area, and download shelf
 // completely fill the area under the tabstrip.
 void CheckViewPositions(BrowserWindowController* controller) {
   NSRect contentView = [[[controller window] contentView] bounds];
   NSRect tabstrip = [[controller tabStripView] frame];
   NSRect toolbar = [[controller toolbarView] frame];
   NSRect infobar = [[controller infoBarContainerView] frame];
   NSRect contentArea = [[controller tabContentArea] frame];
-  NSRect download = [[[controller downloadShelf] view] frame];
+  NSRect download = NSZeroRect;
+  if ([[[controller downloadShelf] view] superview])
+    download = [[[controller downloadShelf] view] frame];
 
   EXPECT_EQ(NSMinY(contentView), NSMinY(download));
   EXPECT_EQ(NSMaxY(download), NSMinY(contentArea));
   EXPECT_EQ(NSMaxY(contentArea), NSMinY(infobar));
 
   // Bookmark bar frame is random memory when hidden.
   if ([controller bookmarkBarVisible]) {
     NSRect bookmark = [[controller bookmarkView] frame];
     EXPECT_EQ(NSMaxY(infobar), NSMinY(bookmark));
     EXPECT_EQ(NSMaxY(bookmark), NSMinY(toolbar));
@@ skipping 144 matching lines @@
   NSView* infobar = [controller_ infoBarContainerView];
 
   // We need to muck with the views a bit to put us in a consistent state before
   // we start resizing.  In particular, we need to move the tab strip to be
   // immediately above the content area, since we layout views to be directly
   // under the tab strip.
   NSRect tabstripFrame = [tabstrip frame];
   tabstripFrame.origin.y = NSMaxY([contentView frame]);
   [tabstrip setFrame:tabstripFrame];
 
-  // The download shelf is created lazily.  Force-create it and set its initial
-  // height to 0.
+  // Make the download shelf and set its initial height to 0.
+  [controller_ createAndAddDownloadShelf];
   NSView* download = [[controller_ downloadShelf] view];
   NSRect downloadFrame = [download frame];
   downloadFrame.size.height = 0;
   [download setFrame:downloadFrame];
 
   // Force a layout and check each view's frame.
   [controller_ layoutSubviews];
   CheckViewPositions(controller_);
 
   // Expand the infobar to 60px and recheck
@@ skipping 29 matching lines @@
   // We need to muck with the views a bit to put us in a consistent state before
   // we start resizing.  In particular, we need to move the tab strip to be
   // immediately above the content area, since we layout views to be directly
   // under the tab strip.
   NSRect tabstripFrame = [tabstrip frame];
   tabstripFrame.origin.y = NSMaxY([contentView frame]);
   [tabstrip setFrame:tabstripFrame];
 
   // The download shelf is created lazily.  Force-create it and set its initial
   // height to 0.
+  [controller_ createAndAddDownloadShelf];
   NSView* download = [[controller_ downloadShelf] view];
   NSRect downloadFrame = [download frame];
   downloadFrame.size.height = 0;
   [download setFrame:downloadFrame];
 
   // Force a layout and check each view's frame.
   [controller_ layoutSubviews];
   CheckViewPositions(controller_);
 
   // Add the bookmark bar and recheck.
   [controller_ resizeView:bookmark newHeight:40];
   CheckViewPositions(controller_);
 
   // Expand the infobar to 60px and recheck
   [controller_ resizeView:infobar newHeight:60];
   CheckViewPositions(controller_);
 
   // Expand the toolbar to 64px and recheck
   [controller_ resizeView:toolbar newHeight:64];
   CheckViewPositions(controller_);
 
   // Add a 30px download shelf and recheck
   [controller_ resizeView:download newHeight:30];
   CheckViewPositions(controller_);
 
   // Remove the bookmark bar and recheck
   profile()->GetPrefs()->SetBoolean(bookmarks::prefs::kShowBookmarkBar, false);
+  [controller_ browserWindow]->BookmarkBarStateChanged(
+      BookmarkBar::DONT_ANIMATE_STATE_CHANGE);
   [controller_ resizeView:bookmark newHeight:0];
   CheckViewPositions(controller_);
 
   // Shrink the infobar to 0px and toolbar to 39px and recheck
   [controller_ resizeView:infobar newHeight:0];
   [controller_ resizeView:toolbar newHeight:39];
   CheckViewPositions(controller_);
 }
 
 // Make sure, by default, the bookmark bar and the toolbar are the same width.
 TEST_F(BrowserWindowControllerTest, BookmarkBarIsSameWidth) {
   // Set the pref to the bookmark bar is visible when the toolbar is
   // first created.
   profile()->GetPrefs()->SetBoolean(bookmarks::prefs::kShowBookmarkBar, true);
 
   // Make sure the bookmark bar is the same width as the toolbar
   NSView* bookmarkBarView = [controller_ bookmarkView];
   NSView* toolbarView = [controller_ toolbarView];
   EXPECT_EQ([toolbarView frame].size.width,
             [bookmarkBarView frame].size.width);
 }
 
 TEST_F(BrowserWindowControllerTest, TestTopRightForBubble) {
   // The bookmark bubble must be attached to a lit and visible star.
   [controller_ setStarredState:YES];
-  NSPoint p = [controller_ bookmarkBubblePoint];
-  NSRect all = [[controller_ window] frame];
+  NSPoint p = [controller_ bookmarkBubblePoint];  // Window coordinates.
+  NSRect all = [[controller_ window] frame];      // Screen coordinates.
 
   // As a sanity check make sure the point is vaguely in the top right
   // of the window.
-  EXPECT_GT(p.y, all.origin.y + (all.size.height/2));
-  EXPECT_GT(p.x, all.origin.x + (all.size.width/2));
+  EXPECT_GT(p.y, all.size.height / 2);
+  EXPECT_GT(p.x, all.size.width / 2);
 }
 
 // By the "zoom frame", we mean what Apple calls the "standard frame".
 TEST_F(BrowserWindowControllerTest, TestZoomFrame) {
   NSWindow* window = [controller_ window];
   ASSERT_TRUE(window);
   NSRect screenFrame = [[window screen] visibleFrame];
   ASSERT_FALSE(NSIsEmptyRect(screenFrame));
 
   // Minimum zoomed width is the larger of 60% of available horizontal space or
@@ skipping 344 matching lines @@
   testFullscreenWindow_.reset(
       [[NSWindow alloc] initWithContentRect:NSMakeRect(0,0,400,400)
                                   styleMask:NSBorderlessWindowMask
                                     backing:NSBackingStoreBuffered
                                       defer:NO]);
   return testFullscreenWindow_.get();
 }
 @end
 
 /* TODO(???): test other methods of BrowserWindowController */