[Mac] Reworked FullscreenToolbarController

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>
 
 #import "base/auto_reset.h"
 #include "base/command_line.h"
@@ skipping 442 matching lines @@
     manager->UpdateAnchorPosition();
 }
 
 - (void)configureFullscreenToolbarController {
   BOOL fullscreenForTab = [self isFullscreenForTabContentOrExtension];
   BOOL kioskMode =
       base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode);
   BOOL showDropdown =
       !fullscreenForTab && !kioskMode && ([self floatingBarHasFocus]);
 
-  NSView* contentView = [[self window] contentView];
   [fullscreenToolbarController_
-      setupFullscreenToolbarForContentView:contentView
-                              showDropdown:showDropdown];
+      setupFullscreenToolbarWithDropdown:showDropdown];
 }
 
 - (void)adjustUIForExitingFullscreenAndStopOmniboxSliding {
   [fullscreenToolbarController_ exitFullscreenMode];
   fullscreenToolbarController_.reset();
 
   // Force the bookmark bar z-order to update.
   [[bookmarkBarController_ view] removeFromSuperview];
   [self layoutSubviews];
 }
@@ skipping 126 matching lines @@
 - (void)showFullscreenExitBubbleIfNecessary {
   // This method is called in response to
   // |-updateFullscreenExitBubbleURL:bubbleType:|. If we're in the middle of the
   // transition into fullscreen (i.e., using the AppKit Fullscreen API), do not
   // show the bubble because it will cause visual jank
   // (http://crbug.com/130649). This will be called again as part of
   // |-windowDidEnterFullScreen:|, so arrange to do that work then instead.
   if (enteringAppKitFullscreen_)
     return;
 
-  [self hideOverlayIfPossibleWithAnimation:NO delay:NO];
+  [self hideOverlayIfPossibleWithAnimation:NO];
 
   switch (exclusiveAccessController_->bubble_type()) {
     case EXCLUSIVE_ACCESS_BUBBLE_TYPE_NONE:
     case EXCLUSIVE_ACCESS_BUBBLE_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION:
       // Show no exit instruction bubble on Mac when in Browser Fullscreen.
       exclusiveAccessController_->Destroy();
       break;
 
     default:
       exclusiveAccessController_->Show();
@@ skipping 224 matching lines @@
 }
 
 - (void)enableBarVisibilityUpdates {
   // Early escape if there's nothing to do.
   if (barVisibilityUpdatesEnabled_)
     return;
 
   barVisibilityUpdatesEnabled_ = YES;
 
   if ([barVisibilityLocks_ count])
-    [fullscreenToolbarController_ ensureOverlayShownWithAnimation:NO delay:NO];
+    [fullscreenToolbarController_ ensureOverlayShownWithAnimation:NO];
   else
-    [fullscreenToolbarController_ ensureOverlayHiddenWithAnimation:NO delay:NO];
+    [fullscreenToolbarController_ ensureOverlayHiddenWithAnimation:NO];
 }
 
 - (void)disableBarVisibilityUpdates {
   // Early escape if there's nothing to do.
   if (!barVisibilityUpdatesEnabled_)
     return;
 
   barVisibilityUpdatesEnabled_ = NO;
-  [fullscreenToolbarController_ cancelAnimationAndTimers];
+  [fullscreenToolbarController_ cancelAnimationAndTimer];
 }
 
-- (void)hideOverlayIfPossibleWithAnimation:(BOOL)animation delay:(BOOL)delay {
+- (void)hideOverlayIfPossibleWithAnimation:(BOOL)animation {
   if (!barVisibilityUpdatesEnabled_ || [barVisibilityLocks_ count])
     return;
-  [fullscreenToolbarController_ ensureOverlayHiddenWithAnimation:animation
-                                                           delay:delay];
+
+  [fullscreenToolbarController_ ensureOverlayHiddenWithAnimation:animation];
 }
 
 - (CGFloat)toolbarDividerOpacity {
   return [bookmarkBarController_ toolbarDividerOpacity];
 }
 
 - (void)updateInfoBarTipVisibility {
   // If there's no toolbar then hide the infobar tip.
   [infoBarContainerController_
       setShouldSuppressTopInfoBarTip:![self hasToolbar]];
@@ skipping 117 matching lines @@
   [infoBarContainerController_
       setMaxTopArrowHeight:output.infoBarMaxTopArrowHeight];
   [infoBarContainerController_
       setInfobarArrowX:[self locationBarBridge]->GetPageInfoBubblePoint().x];
 
   if (!NSIsEmptyRect(output.downloadShelfFrame))
     [[downloadShelfController_ view] setFrame:output.downloadShelfFrame];
 
   [self layoutTabContentArea:output.contentAreaFrame];
 
-  if (!NSIsEmptyRect(output.fullscreenBackingBarFrame)) {
+  if (!NSIsEmptyRect(output.fullscreenBackingBarFrame))
     [floatingBarBackingView_ setFrame:output.fullscreenBackingBarFrame];
-    [fullscreenToolbarController_
-        overlayFrameChanged:output.fullscreenBackingBarFrame];
-  }
 
   [findBarCocoaController_
       positionFindBarViewAtMaxY:output.findBarMaxY
                        maxWidth:NSWidth(output.contentAreaFrame)];
 
   exclusiveAccessController_->Layout(output.fullscreenExitButtonMaxY);
 
   if (fullscreenLowPowerCoordinator_) {
     fullscreenLowPowerCoordinator_->SetLayoutParameters(
         output.toolbarFrame, output.infoBarFrame, output.contentAreaFrame,
@@ skipping 242 matching lines @@
   if (fullscreenLowPowerCoordinator_)
     fullscreenLowPowerCoordinator_->SetHasActiveSheet(false);
 }
 
 - (void)childWindowsDidChange {
   if (fullscreenLowPowerCoordinator_)
     fullscreenLowPowerCoordinator_->ChildWindowsChanged();
 }
 
 @end  // @implementation BrowserWindowController(Private)