[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/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_controller.h"
 #import "chrome/browser/ui/cocoa/view_id_util.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/common/notification_details.h"
 #include "content/common/notification_source.h"
 #include "skia/ext/skia_utils_mac.h"
 
 // C++ class that receives INFOBAR_ADDED and INFOBAR_REMOVED
@@ skipping 98 matching lines @@
   // 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];
   [closingInfoBars_ removeObject:controller];
   [self positionInfoBarsAndRedraw];
 }
 
+- (BrowserWindowController*)browserWindowController {
+  id controller = [[[self view] window] windowController];
+  if (![controller isKindOfClass:[BrowserWindowController class]])
+    return nil;
+  return controller;
+}
+
 - (void)changeTabContents:(TabContentsWrapper*)contents {
   registrar_.RemoveAll();
   [self removeAllInfoBars];
 
   currentTabContents_ = contents;
   if (currentTabContents_) {
     for (size_t i = 0; i < currentTabContents_->infobar_count(); ++i) {
       InfoBar* infobar = currentTabContents_->GetInfoBarDelegateAt(i)->
           CreateInfoBar(currentTabContents_);
       [self addInfoBar:infobar animate:NO];
@@ skipping 13 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;
+
+  // Take out the height of the tip from the total size of the infobar so that
+  // the tip overlaps the preceding infobar when there is more than one infobar.
   for (InfoBarController* controller in infobarControllers_.get())
-    height += NSHeight([[controller view] frame]);
+    height += NSHeight([[controller view] frame]) - infobars::kTipHeight;
+
+  // If there are any infobars, add a little extra room for the tip of the first
+  // 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