mac: Refactor browser_window_controller layout logic.

chrome/browser/ui/cocoa/infobars/infobar_container_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/infobars/infobar_container_controller.h"
 
 #include "base/logging.h"
 #include "base/mac/mac_util.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
@@ skipping 14 matching lines @@
 @end
 
 
 @implementation InfoBarContainerController
 
 @synthesize shouldSuppressTopInfoBarTip = shouldSuppressTopInfoBarTip_;
 
 - (id)initWithResizeDelegate:(id<ViewResizer>)resizeDelegate {
   DCHECK(resizeDelegate);
   if ((self = [super initWithNibName:nil bundle:nil])) {
+    // This view and its subviews use autoresizing masks, The starting frame
+    // needs to be reasonably large, although its exactly values don't matter.
+    // It cannot be NSZeroRect.
     base::scoped_nsobject<NSView> view(
-        [[NSView alloc] initWithFrame:NSZeroRect]);
+        [[NSView alloc] initWithFrame:NSMakeRect(0, 0, 800, 100)]);
     [view setAutoresizingMask:NSViewWidthSizable | NSViewMinYMargin];
     view_id_util::SetID(view, VIEW_ID_INFO_BAR_CONTAINER);
     [self setView:view];
 
     resizeDelegate_ = resizeDelegate;
     containerCocoa_.reset(new InfoBarContainerCocoa(self));
     infobarControllers_.reset([[NSMutableArray alloc] init]);
   }
   return self;
 }
@@ skipping 74 matching lines @@
     frame.origin.x = NSMinX(containerBounds);
     frame.origin.y = minY;
     frame.size.width = NSWidth(containerBounds);
     frame.size.height = [controller infobar]->total_height();
     [[controller view] setFrame:frame];
 
     minY += NSHeight(frame) - [controller infobar]->arrow_height();
     [controller layoutArrow];
   }
 
-  int totalHeight = 0;
-  int overlap = containerCocoa_->GetVerticalOverlap(&totalHeight);
-
-  if (NSHeight([[self view] frame]) != totalHeight) {
-    [resizeDelegate_ resizeView:[self view] newHeight:totalHeight];
-  } else if (oldOverlappingTipHeight_ != overlap) {
-    // If the infobar overlap changed but the height didn't change then
-    // explicitly ask for a layout.
-    [[self browserWindowController] layoutInfoBars];
-  }
-  oldOverlappingTipHeight_ = overlap;
+  [resizeDelegate_ resizeView:[self view] newHeight:[self heightOfInfoBars]];
 }
 
 - (void)setShouldSuppressTopInfoBarTip:(BOOL)flag {
   if (shouldSuppressTopInfoBarTip_ == flag)
     return;
   shouldSuppressTopInfoBarTip_ = flag;
   [self positionInfoBarsAndRedraw:isAnimating_];
 }
 
 - (void)removeController:(InfoBarController*)controller {
   if (![infobarControllers_ containsObject:controller])
     return;
 
   // This code can be executed while InfoBarController is still on the stack, so
   // we retain and autorelease the controller to prevent it from being
   // dealloc'ed too early.
   [[controller retain] autorelease];
   [[controller view] removeFromSuperview];
   [infobarControllers_ removeObject:controller];
 }
 
 - (void)setMaxTopArrowHeight:(NSInteger)height {
   containerCocoa_->SetMaxTopArrowHeight(height);
 }
 
+- (CGFloat)heightOfInfoBars {
+  CGFloat totalHeight = 0;
+  for (InfoBarController* controller in infobarControllers_.get()) {
+    totalHeight += [controller infobar]->total_height() -
+                   [controller infobar]->arrow_height();
+  }
+  return totalHeight;
+}
+
 @end