[Mac] Refactor the fullscreen code to move logic from BWC into FullscreenCont...

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 141 matching lines @@
   CGFloat minX = NSMinX(contentBounds);
   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 floatingBarShownFraction =
+      isFullscreen ? [fullscreenController_ floatingBarShownFraction] : 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) -
+      (floor((1 - floatingBarShownFraction) * floatingBarHeight) -
           [fullscreenController_ floatingBarVerticalOffset]) : 0;
   CGFloat maxY = NSMaxY(contentBounds) + yOffset;
   CGFloat startMaxY = maxY;
 
   if ([self hasTabStrip] && ![self useVerticalTabs]) {
     // If we need to lay out the top tab strip, replace |maxY| and |startMaxY|
     // with higher values, and then lay out the tab strip.
     NSRect windowFrame = [contentView convertRect:[window frame] fromView:nil];
     startMaxY = maxY = NSHeight(windowFrame) + yOffset;
     maxY = [self layoutTabStripAtMaxY:maxY width:width fullscreen:isFullscreen];
@@ skipping 59 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;
 
+  // If there's nothing in the floating bar, it has zero height.
+  // TODO(rohitrao): Should be possible to check [subviews count] here.
+  if (!([self hasLocationBar] || [self hasTabStrip] || [self hasToolbar]))
+    return 0;
+
   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;
@@ skipping 96 matching lines @@
   // TODO(viettrungluu): Does this really belong here? Calling it shouldn't be
   // necessary in the non-NTP case.
   [bookmarkBarController_ layoutSubviews];
 
   return maxY;
 }
 
 - (void)layoutFloatingBarBackingView:(NSRect)frame
                           fullscreen:(BOOL)fullscreen {
   // Only display when in fullscreen mode.
-  if (fullscreen) {
-    // 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.)
-    if (floatingBarBackingView_.get()) {
-      BOOL aboveBookmarkBar = [self placeBookmarkBarBelowInfoBar];
+  if (!fullscreen)
+    return;
 
-      // 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;
-      }
+  NSView* floatingBarBackingView =
+      [fullscreenController_ floatingBarBackingView];
+  BOOL aboveBookmarkBar = [self placeBookmarkBarBelowInfoBar];
 
-      // Set its frame.
-      [floatingBarBackingView_ setFrame:frame];
-    }
+  // 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;
+  }
 
-    // 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];
-  }
+  // Set its frame.
+  [floatingBarBackingView setFrame:frame];
+  [fullscreenController_ overlayFrameChanged:frame];
 }
 
 - (CGFloat)layoutInfoBarAtMinX:(CGFloat)minX
                           maxY:(CGFloat)maxY
                          width:(CGFloat)width {
   NSView* infoBarView = [infoBarContainerController_ view];
   NSRect infoBarFrame = [infoBarView frame];
   infoBarFrame.origin.x = minX;
   infoBarFrame.origin.y = maxY - NSHeight(infoBarFrame);
   infoBarFrame.size.width = width;
@@ skipping 59 matching lines @@
     return;
 
   toolbarFrame.size.height = newHeight;
   NSRect bookmarkFrame = [[bookmarkBarController_ view] frame];
   bookmarkFrame.size.height = bookmarkFrame.size.height - deltaH;
   [[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() &&
-      ([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)