[Mac] Unspoofable infobars v3.

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.
 
 #include "base/logging.h"
 #include "base/mac/mac_util.h"
 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
 #include "chrome/browser/tab_contents/infobar.h"
 #import "chrome/browser/ui/cocoa/animatable_view.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h"
@@ skipping 140 matching lines @@
 
 - (void)tabDetachedWithContents:(TabContentsWrapper*)contents {
   if (currentTabContents_ == contents)
     [self changeTabContents:NULL];
 }
 
 - (NSUInteger)infobarCount {
   return [infobarControllers_ count] - [closingInfoBars_ count];
 }
 
-- (CGFloat)antiSpoofHeight {
-  return 0;
+- (CGFloat)overlappingTipHeight {
+  return [self infobarCount] ? infobars::kTipHeight : 0;
 }
 
 - (void)resizeView:(NSView*)view newHeight:(CGFloat)height {
   NSRect frame = [view frame];
   frame.size.height = height;
   [view setFrame:frame];
   [self positionInfoBarsAndRedraw];
 }
 
 - (void)setAnimationInProgress:(BOOL)inProgress {
   if ([resizeDelegate_ respondsToSelector:@selector(setAnimationInProgress:)])
     [resizeDelegate_ setAnimationInProgress:inProgress];
 }
 
 @end
 
 @implementation InfoBarContainerController (PrivateMethods)
 
 - (CGFloat)desiredHeight {
   CGFloat height = 0;
+
   for (InfoBarController* controller in infobarControllers_.get())

[rohitrao (ping after 24h), 2011/08/05 14:24:12]

Add a comment reminding us that NSHeight(eachInfobar) includes the tip, so
that's why we're subtracting it away.

[Robert Sesek, 2011/08/05 15:10:40]

Done.

-    height += NSHeight([[controller view] frame]);
+    height += NSHeight([[controller view] frame]) - infobars::kTipHeight;
+
+  // If there's any infobars, add a little extra room for the tip of the first

[rohitrao (ping after 24h), 2011/08/05 14:24:12]

s/there's/there are/

[Robert Sesek, 2011/08/05 15:10:40]

Done.

+  // infobar.
+  if (height)
+    height += infobars::kTipHeight;
+
   return height;
 }
 
 - (void)addInfoBar:(InfoBar*)infobar animate:(BOOL)animate {
   InfoBarController* controller = infobar->controller();
   [controller setContainerController:self];
   [[controller animatableView] setResizeDelegate:self];
   [[self view] addSubview:[controller view]];
   [infobarControllers_ addObject:[controller autorelease]];
 
@@ skipping 41 matching lines @@
   // the others below.
   for (InfoBarController* controller in
            [infobarControllers_ reverseObjectEnumerator]) {
     NSView* view = [controller view];
     NSRect frame = [view frame];
     frame.origin.x = NSMinX(containerBounds);
     frame.origin.y = minY;
     frame.size.width = NSWidth(containerBounds);
     [view setFrame:frame];
 
-    minY += NSHeight(frame);
+    minY += NSHeight(frame) - infobars::kTipHeight;
   }
 
   [resizeDelegate_ resizeView:[self view] newHeight:[self desiredHeight]];
 }
 
 @end