[Mac] Fix cut-off Browser chrome when opening Tabpose with an infobar showing.

chrome/browser/ui/cocoa/browser_window_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/browser_window_controller.h"
 
 #include <Carbon/Carbon.h>
 
 #include "app/mac/scoped_nsdisable_screen_updates.h"
 #include "app/mac/nsimage_cache.h"
@@ skipping 406 matching lines @@
 }
 
 - (ToolbarController*)toolbarController {
   return toolbarController_.get();
 }
 
 - (TabStripController*)tabStripController {
   return tabStripController_.get();
 }
 
+- (InfoBarContainerController*)infoBarContainerController {
+  return infoBarContainerController_.get();
+}
+
 - (StatusBubbleMac*)statusBubble {
   return statusBubble_;
 }
 
 - (LocationBarViewMac*)locationBarBridge {
   return [toolbarController_ locationBarBridge];
 }
 
 - (void)destroyBrowser {
   [NSApp removeWindowsItem:[self window]];
@@ skipping 1595 matching lines @@
                                                         delay:delay];
     }
   }
 }
 
 - (BOOL)floatingBarHasFocus {
   NSResponder* focused = [[self window] firstResponder];
   return [focused isKindOfClass:[AutocompleteTextFieldEditor class]];
 }
 
+- (void)tabposeWillClose:(NSNotification*)notif {
+  // Re-show the container after Tabpose closes.
+  [[infoBarContainerController_ view] setHidden:NO];
+}
+
 - (void)openTabpose {
   NSUInteger modifierFlags = [[NSApp currentEvent] modifierFlags];
   BOOL slomo = (modifierFlags & NSShiftKeyMask) != 0;
 
   // Cover info bars, inspector window, and detached bookmark bar on NTP.
   // Do not cover download shelf.
   NSRect activeArea = [[self tabContentArea] frame];
+  // Take out the anti-spoof height so that Tabpose doesn't draw on top of the
+  // browser chrome.
   activeArea.size.height +=
-      NSHeight([[infoBarContainerController_ view] frame]);
+      NSHeight([[infoBarContainerController_ view] frame]) -
+          [infoBarContainerController_ antiSpoofHeight];
   if ([self isBookmarkBarVisible] && [self placeBookmarkBarBelowInfoBar]) {
     NSView* bookmarkBarView = [bookmarkBarController_ view];
     activeArea.size.height += NSHeight([bookmarkBarView frame]);
   }
 
-  [TabposeWindow openTabposeFor:[self window]
-                           rect:activeArea
-                          slomo:slomo
-                  tabStripModel:browser_->tabstrip_model()];
+  // Hide the infobar container so that the anti-spoof bulge doesn't show when
+  // Tabpose is open.
+  [[infoBarContainerController_ view] setHidden:YES];
+
+  TabposeWindow* window =
+      [TabposeWindow openTabposeFor:[self window]
+                               rect:activeArea
+                              slomo:slomo
+                      tabStripModel:browser_->tabstrip_model()];
+
+  // When the Tabpose window closes, the infobar container needs to be made
+  // visible again.
+  NSNotificationCenter* center = [NSNotificationCenter defaultCenter];
+  [center addObserver:self
+             selector:@selector(tabposeWillClose:)
+                 name:NSWindowWillCloseNotification
+               object:window];
 }
 
 @end  // @implementation BrowserWindowController(Fullscreen)
 
 
 @implementation BrowserWindowController(WindowType)
 
 - (BOOL)supportsWindowFeature:(int)feature {
   return browser_->SupportsWindowFeature(
       static_cast<Browser::WindowFeature>(feature));
@@ skipping 13 matching lines @@
 
 - (BOOL)supportsBookmarkBar {
   return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR];
 }
 
 - (BOOL)isNormalWindow {
   return browser_->type() == Browser::TYPE_NORMAL;
 }
 
 @end  // @implementation BrowserWindowController(WindowType)