[Mac] Unspoofable infobars v3.

chrome/browser/ui/cocoa/browser_window_controller_private.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/browser_window_controller_private.h"
 
 #include <cmath>
 
 #include "base/command_line.h"
 #import "base/memory/scoped_nsobject.h"
@@ skipping 476 matching lines @@
       [floatingBarBackingView_ removeFromSuperview];
   }
 }
 
 - (CGFloat)layoutInfoBarAtMinX:(CGFloat)minX
                           maxY:(CGFloat)maxY
                          width:(CGFloat)width {
   NSView* containerView = [infoBarContainerController_ view];
   NSRect containerFrame = [containerView frame];
   maxY -= NSHeight(containerFrame);
-  maxY += [infoBarContainerController_ antiSpoofHeight];
+  maxY += [infoBarContainerController_ overlappingTipHeight];
   containerFrame.origin.x = minX;
   containerFrame.origin.y = maxY;
   containerFrame.size.width = width;
   [containerView setFrame:containerFrame];
   return maxY;
 }
 
 - (CGFloat)layoutDownloadShelfAtMinX:(CGFloat)minX
                                 minY:(CGFloat)minY
                                width:(CGFloat)width {
@@ skipping 274 matching lines @@
   }
 
   // Adjust the infobar container. In fullscreen, it needs to be below all
   // top chrome elements so it only sits atop the web contents. When in normal
   // mode, it needs to draw over the bookmark bar and part of the toolbar.
   [[infoBarContainerController_ view] removeFromSuperview];
   NSView* infoBarDest = [[self window] contentView];
   [infoBarDest addSubview:[infoBarContainerController_ view]
                positioned:fullscreen ? NSWindowBelow : NSWindowAbove
                relativeTo:fullscreen ? nil
-                                     : [bookmarkBarController_ view]];
+                                     : [toolbarController_ view]];
 }
 
 - (void)contentViewDidResize:(NSNotification*)notification {
   [self layoutSubviews];
 }
 
 - (void)registerForContentViewResizeNotifications {
   [[NSNotificationCenter defaultCenter]
       addObserver:self
          selector:@selector(contentViewDidResize:)
@@ skipping 67 matching lines @@
 - (void)disableBarVisibilityUpdates {
   // Early escape if there's nothing to do.
   if (!barVisibilityUpdatesEnabled_)
     return;
 
   barVisibilityUpdatesEnabled_ = NO;
   [presentationModeController_ cancelAnimationAndTimers];
 }
 
 @end  // @implementation BrowserWindowController(Private)