Mac: fix fullscreen floating bar in popup windows.

chrome/browser/cocoa/browser_window_controller_private.mm

 // Copyright (c) 2010 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/cocoa/browser_window_controller_private.h"
 
 #include "base/mac_util.h"
 #import "base/scoped_nsobject.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
@@ skipping 122 matching lines @@
   NSRect contentBounds = [contentView bounds];
   CGFloat minY = NSMinY(contentBounds);
   CGFloat width = NSWidth(contentBounds);
 
   // Suppress title drawing if necessary.
   if ([window respondsToSelector:@selector(setShouldHideTitle:)])
     [(id)window setShouldHideTitle:![self hasTitleBar]];
 
   BOOL isFullscreen = [self isFullscreen];
   CGFloat floatingBarHeight = [self floatingBarHeight];
-  CGFloat yOffset = floor(
-      isFullscreen ? (1 - floatingBarShownFraction_) * floatingBarHeight : 0);
+  // In fullscreen mode, |yOffset| accounts for the sliding position of the
+  // floating bar and the extra offset needed to dodge the menu bar.
+  CGFloat yOffset = isFullscreen ?
+      (floor((1 - floatingBarShownFraction_) * floatingBarHeight) -
+          [fullscreenController_ floatingBarVerticalOffset]) : 0;
   CGFloat maxY = NSMaxY(contentBounds) + yOffset;
   CGFloat startMaxY = maxY;
 
   if ([self hasTabStrip]) {
     // If we need to lay out the tab strip, replace |maxY| and |startMaxY| with
     // higher values, and then lay out the tab strip.
     startMaxY = maxY = NSHeight([window frame]) + yOffset;
     maxY = [self layoutTabStripAtMaxY:maxY width:width fullscreen:isFullscreen];
   }
 
   // Sanity-check |maxY|.
   DCHECK_GE(maxY, minY);
   DCHECK_LE(maxY, NSMaxY(contentBounds) + yOffset);
 
   // Place the toolbar at the top of the reserved area.
   maxY = [self layoutToolbarAtMaxY:maxY width:width];
 
   // If we're not displaying the bookmark bar below the infobar, then it goes
   // immediately below the toolbar.
   BOOL placeBookmarkBarBelowInfoBar = [self placeBookmarkBarBelowInfoBar];
   if (!placeBookmarkBarBelowInfoBar)
     maxY = [self layoutBookmarkBarAtMaxY:maxY width:width];
 
   // The floating bar backing view doesn't actually add any height.
   [self layoutFloatingBarBackingViewAtY:maxY
                                   width:width
                                  height:floatingBarHeight
                              fullscreen:isFullscreen];
 
-  [fullscreenController_ overlayFrameChanged:[floatingBarBackingView_ frame]];
-
   // Place the find bar immediately below the toolbar/attached bookmark bar. In
   // fullscreen mode, it hangs off the top of the screen when the bar is hidden.
   [findBarCocoaController_ positionFindBarViewAtMaxY:maxY maxWidth:width];
 
   // If in fullscreen mode, reset |maxY| to top of screen, so that the floating
   // bar slides over the things which appear to be in the content area.
   if (isFullscreen)
     maxY = NSMaxY(contentBounds);
 
   // Also place the infobar container immediate below the toolbar, except in
@@ skipping 16 matching lines @@
   // Normally, we don't need to tell the toolbar whether or not to show the
   // divider, but things break down during animation.
   [toolbarController_
       setDividerOpacity:[bookmarkBarController_ toolbarDividerOpacity]];
 }
 
 - (CGFloat)floatingBarHeight {
   if (![self isFullscreen])
     return 0;
 
-  CGFloat totalHeight = [fullscreenController_ tabStripVerticalOffset];
+  CGFloat totalHeight = [fullscreenController_ floatingBarVerticalOffset];
 
   if ([self hasTabStrip])
     totalHeight += NSHeight([[self tabStripView] frame]);
 
   if ([self hasToolbar]) {
     totalHeight += NSHeight([[toolbarController_ view] frame]);
   } else if ([self hasLocationBar]) {
     totalHeight += NSHeight([[toolbarController_ view] frame]) +
-        kLocBarTopInset + kLocBarBottomInset;
+                   kLocBarTopInset + kLocBarBottomInset;
   }
 
   if (![self placeBookmarkBarBelowInfoBar])
     totalHeight += NSHeight([[bookmarkBarController_ view] frame]);
 
   return totalHeight;
 }
 
 - (CGFloat)layoutTabStripAtMaxY:(CGFloat)maxY
                           width:(CGFloat)width
                      fullscreen:(BOOL)fullscreen {
   // Nothing to do if no tab strip.
   if (![self hasTabStrip])
     return maxY;
 
   NSView* tabStripView = [self tabStripView];
   CGFloat tabStripHeight = NSHeight([tabStripView frame]);
-  // In fullscreen mode, push the tab strip down so that the main menu (which
-  // also slides down) doesn't run it over.
-  if (fullscreen)
-    maxY -= [fullscreenController_ tabStripVerticalOffset];
   maxY -= tabStripHeight;
   [tabStripView setFrame:NSMakeRect(0, maxY, width, tabStripHeight)];
 
   // Set indentation.
   [tabStripController_ setIndentForControls:(fullscreen ? 0 :
       [[tabStripController_ class] defaultIndentForControls])];
 
   // TODO(viettrungluu): Seems kind of bad -- shouldn't |-layoutSubviews| do
   // this? Moreover, |-layoutTabs| will try to animate....
   [tabStripController_ layoutTabs];
@@ skipping 67 matching lines @@
 
   return maxY;
 }
 
 - (void)layoutFloatingBarBackingViewAtY:(CGFloat)y
                                   width:(CGFloat)width
                                  height:(CGFloat)height
                              fullscreen:(BOOL)fullscreen {
   // Only display when in fullscreen mode.
   if (fullscreen) {
-    DCHECK(floatingBarBackingView_.get());
-    BOOL aboveBookmarkBar = [self placeBookmarkBarBelowInfoBar];
+    // For certain window types such as app windows (e.g., the dev tools
+    // window), there's no actual overlay. (Displaying one would result in an
+    // overly sliding in only under the menu, which gives an ugly effect.)
+    NSRect frame = NSMakeRect(0, y, width, height);
+    if (floatingBarBackingView_.get()) {
+      BOOL aboveBookmarkBar = [self placeBookmarkBarBelowInfoBar];
 
-    // Insert it into the view hierarchy if necessary.
-    if (![floatingBarBackingView_ superview] ||
-        aboveBookmarkBar != floatingBarAboveBookmarkBar_) {
-      NSView* contentView = [[self window] contentView];
-      // z-order gets messed up unless we explicitly remove the floatingbar view
-      // and re-add it.
-      [floatingBarBackingView_ removeFromSuperview];
-      [contentView addSubview:floatingBarBackingView_
-                   positioned:(aboveBookmarkBar ?
-                                   NSWindowAbove : NSWindowBelow)
-                   relativeTo:[bookmarkBarController_ view]];
-      floatingBarAboveBookmarkBar_ = aboveBookmarkBar;
+      // Insert it into the view hierarchy if necessary.
+      if (![floatingBarBackingView_ superview] ||
+          aboveBookmarkBar != floatingBarAboveBookmarkBar_) {
+        NSView* contentView = [[self window] contentView];
+        // z-order gets messed up unless we explicitly remove the floatingbar
+        // view and re-add it.
+        [floatingBarBackingView_ removeFromSuperview];
+        [contentView addSubview:floatingBarBackingView_
+                     positioned:(aboveBookmarkBar ?
+                                     NSWindowAbove : NSWindowBelow)
+                     relativeTo:[bookmarkBarController_ view]];
+        floatingBarAboveBookmarkBar_ = aboveBookmarkBar;
+      }
+
+      // Set its frame.
+      [floatingBarBackingView_ setFrame:frame];
     }
 
-    // Set its frame.
-    [floatingBarBackingView_ setFrame:NSMakeRect(0, y, width, height)];
+    // But we want the logic to work as usual (for show/hide/etc. purposes).
+    [fullscreenController_ overlayFrameChanged:frame];
   } else {
     // Okay to call even if |floatingBarBackingView_| is nil.
     if ([floatingBarBackingView_ superview])
       [floatingBarBackingView_ removeFromSuperview];
   }
 }
 
 - (CGFloat)layoutInfoBarAtMaxY:(CGFloat)maxY width:(CGFloat)width {
   NSView* infoBarView = [infoBarContainerController_ view];
   NSRect infoBarFrame = [infoBarView frame];
@@ skipping 65 matching lines @@
   [[toolbarController_ view] setFrame:toolbarFrame];
   [[bookmarkBarController_ view] setFrame:bookmarkFrame];
   [self layoutSubviews];
 }
 
 // TODO(rohitrao): This function has shrunk into uselessness, and
 // |-setFullscreen:| has grown rather large.  Find a good way to break up
 // |-setFullscreen:| into smaller pieces.  http://crbug.com/36449
 - (void)adjustUIForFullscreen:(BOOL)fullscreen {
   // Create the floating bar backing view if necessary.
-  if (fullscreen && !floatingBarBackingView_.get()) {
+  if (fullscreen && !floatingBarBackingView_.get() &&
+      ([self hasTabStrip] || [self hasToolbar] || [self hasLocationBar])) {
     floatingBarBackingView_.reset(
         [[FloatingBarBackingView alloc] initWithFrame:NSZeroRect]);
   }
 }
 
 - (void)enableBarVisibilityUpdates {
   // Early escape if there's nothing to do.
   if (barVisibilityUpdatesEnabled_)
     return;
 
   barVisibilityUpdatesEnabled_ = YES;
 
   if ([barVisibilityLocks_ count])
     [fullscreenController_ ensureOverlayShownWithAnimation:NO delay:NO];
   else
     [fullscreenController_ ensureOverlayHiddenWithAnimation:NO delay:NO];
 }
 
 - (void)disableBarVisibilityUpdates {
   // Early escape if there's nothing to do.
   if (!barVisibilityUpdatesEnabled_)
     return;
 
   barVisibilityUpdatesEnabled_ = NO;
   [fullscreenController_ cancelAnimationAndTimers];
 }
 
 @end  // @implementation BrowserWindowController(Private)