[Mac] Refactor the Fullscreen Toolbar Visibility Locks

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 348 matching lines @@
 
   // Close the bookmark bubble, if it's open.  Use |-ok:| instead of |-cancel:|
   // or |-close| because that matches the behavior when the bubble loses key
   // status.
   [bookmarkBubbleController_ ok:self];
 
   // Save the current first responder so we can restore after views are moved.
   base::scoped_nsobject<FocusTracker> focusTracker(
       [[FocusTracker alloc] initWithWindow:sourceWindow]);
 
-  // While we move views (and focus) around, disable any bar visibility changes.
-  [self disableBarVisibilityUpdates];
-

[spqchan, 2016/10/28 17:00:05]

FYI, I removed these because we no longer show the toolbar when we enter
immersive fullscreen. So this is pretty much dead.

   // Retain the tab strip view while we remove it from its superview.
   base::scoped_nsobject<NSView> tabStripView;
   if ([self hasTabStrip]) {
     tabStripView.reset([[self tabStripView] retain]);
     [tabStripView removeFromSuperview];
   }
 
   // Disable autoresizing of subviews while we move views around. This prevents
   // spurious renderer resizes.
   [self.chromeContentView setAutoresizesSubviews:NO];
@@ skipping 53 matching lines @@
   [destWindow setCollectionBehavior:behavior];
 
   if (![focusTracker restoreFocusInWindow:destWindow]) {
     // During certain types of fullscreen transitions, the view that had focus
     // may have gone away (e.g., the one for a Flash FS widget).  In this case,
     // FocusTracker will fail to restore focus to anything, so we set the focus
     // to the tab contents as a reasonable fall-back.
     [self focusTabContents];
   }
   [sourceWindow orderOut:self];
-
-  // We're done moving focus, so re-enable bar visibility changes.
-  [self enableBarVisibilityUpdates];
 }
 
 - (void)updatePermissionBubbleAnchor {
   PermissionRequestManager* manager = [self permissionRequestManager];
   if (manager)
     manager->UpdateAnchorPosition();
 }
 
 - (void)adjustUIForExitingFullscreenAndStopOmniboxSliding {
   [fullscreenToolbarController_ exitFullscreenMode];
@@ skipping 136 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];
-
   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 212 matching lines @@
 - (void)adjustUIForEnteringFullscreen {
   FullscreenSlidingStyle style = FullscreenSlidingStyle::OMNIBOX_TABS_PRESENT;
   if ([self isFullscreenForTabContentOrExtension])
     style = FullscreenSlidingStyle::OMNIBOX_TABS_NONE;
   else if (!shouldShowFullscreenToolbar_)
     style = FullscreenSlidingStyle::OMNIBOX_TABS_HIDDEN;
 
   [self adjustUIForSlidingFullscreenStyle:style];
 }
 
-- (void)enableBarVisibilityUpdates {
-  // Early escape if there's nothing to do.
-  if (barVisibilityUpdatesEnabled_)
-    return;
-
-  barVisibilityUpdatesEnabled_ = YES;
-
-  if ([barVisibilityLocks_ count])
-    [fullscreenToolbarController_ ensureOverlayShownWithAnimation:NO];
-  else
-    [fullscreenToolbarController_ ensureOverlayHiddenWithAnimation:NO];
-}
-
-- (void)disableBarVisibilityUpdates {
-  // Early escape if there's nothing to do.
-  if (!barVisibilityUpdatesEnabled_)
-    return;
-
-  barVisibilityUpdatesEnabled_ = NO;
-  [fullscreenToolbarController_ cancelAnimationAndTimer];
-}
-
-- (void)hideOverlayIfPossibleWithAnimation:(BOOL)animation {
-  if (!barVisibilityUpdatesEnabled_ || [barVisibilityLocks_ count])
-    return;
-
-  [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 371 matching lines @@
   if (fullscreenLowPowerCoordinator_)
     fullscreenLowPowerCoordinator_->SetHasActiveSheet(false);
 }
 
 - (void)childWindowsDidChange {
   if (fullscreenLowPowerCoordinator_)
     fullscreenLowPowerCoordinator_->ChildWindowsChanged();
 }
 
 @end  // @implementation BrowserWindowController(Private)