Fix some infobar problems.

chrome/browser/ui/cocoa/browser_window_controller_private.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_private.h"
 
 #include <cmath>
 
 #include "base/command_line.h"
 #include "base/mac/mac_util.h"
@@ skipping 457 matching lines @@
                           maxY:(CGFloat)maxY
                          width:(CGFloat)width {
   NSView* containerView = [infoBarContainerController_ view];
   NSRect containerFrame = [containerView frame];
   maxY -= NSHeight(containerFrame);
   maxY += [infoBarContainerController_ overlappingTipHeight];
   containerFrame.origin.x = minX;
   containerFrame.origin.y = maxY;
   containerFrame.size.width = width;
   [containerView setFrame:containerFrame];
+  [infoBarContainerController_ setMaxTopArrowHeight:[self
+      infoBarMaxTopArrowHeight]];
   return maxY;
 }
 
 - (CGFloat)layoutDownloadShelfAtMinX:(CGFloat)minX
                                 minY:(CGFloat)minY
                                width:(CGFloat)width {
   if (downloadShelfController_.get()) {
     NSView* downloadView = [downloadShelfController_ view];
     NSRect downloadFrame = [downloadView frame];
     downloadFrame.origin.x = minX;
@@ skipping 563 matching lines @@
     }
   }
 }
 
 - (void)updateInfoBarTipVisibility {
   // If there's no toolbar then hide the infobar tip.
   [infoBarContainerController_
       setShouldSuppressTopInfoBarTip:![self hasToolbar]];
 }
 
+- (NSInteger)infoBarMaxTopArrowHeight {
+  NSInteger topArrowHeight = 0;
+  LocationBarViewMac* locationBarView = [self locationBarBridge];
+  NSPoint iconBottom = locationBarView->GetPageInfoBubblePoint();
+
+  CGFloat overlappingTipHeight =
+      [infoBarContainerController_ overlappingTipHeight];
+  NSPoint infoBarTop =
+      NSMakePoint(0, NSHeight([infoBarContainerController_ view].frame) -
+                  overlappingTipHeight);
+  infoBarTop = [[infoBarContainerController_ view] convertPoint:infoBarTop
+                                                         toView:nil];
+
+  topArrowHeight = iconBottom.y - infoBarTop.y;
+  return topArrowHeight;
+}
+
 @end  // @implementation BrowserWindowController(Private)