[Mac] Fullscreen Toolbar Edge Cases

chrome/browser/ui/cocoa/browser_window_controller.mm

 // Copyright 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.h"
 
 #include <cmath>
 #include <numeric>
 #include <utility>
 
@@ skipping 1852 matching lines @@
 @implementation BrowserWindowController(Fullscreen)
 
 - (void)enterBrowserFullscreen {
   [self enterAppKitFullscreen];
 }
 
 - (void)updateUIForTabFullscreen:
     (ExclusiveAccessContext::TabFullscreenState)state {
   DCHECK([self isInAnyFullscreenMode]);
   if (state == ExclusiveAccessContext::STATE_ENTER_TAB_FULLSCREEN) {
-    [self adjustUIForSlidingFullscreenStyle:fullscreen_mac::OMNIBOX_TABS_NONE];
+    [self adjustUIForSlidingFullscreenStyle:FullscreenSlidingStyle::
+                                                OMNIBOX_TABS_NONE];
     return;
   }
 
   [self adjustUIForSlidingFullscreenStyle:
-            shouldShowFullscreenToolbar_ ? fullscreen_mac::OMNIBOX_TABS_PRESENT
-                                         : fullscreen_mac::OMNIBOX_TABS_HIDDEN];
+            shouldShowFullscreenToolbar_
+                ? FullscreenSlidingStyle::OMNIBOX_TABS_PRESENT
+                : FullscreenSlidingStyle::OMNIBOX_TABS_HIDDEN];
 }
 
 - (void)updateFullscreenExitBubble {
   [self layoutSubviews];
   [self showFullscreenExitBubbleIfNecessary];
 }
 
 - (BOOL)exitExtensionFullscreenIfPossible {
   if (browser_->exclusive_access_manager()
           ->fullscreen_controller()
           ->IsExtensionFullscreenOrPending()) {
     browser_->extension_window_controller()->SetFullscreenMode(NO, GURL());
     return YES;
   }
   return NO;
 }
 
 - (void)setFullscreenToolbarVisible:(BOOL)visible {
   if (shouldShowFullscreenToolbar_ == visible)
     return;
 
   shouldShowFullscreenToolbar_ = visible;
   [self adjustUIForSlidingFullscreenStyle:
-            shouldShowFullscreenToolbar_ ? fullscreen_mac::OMNIBOX_TABS_PRESENT
-                                         : fullscreen_mac::OMNIBOX_TABS_HIDDEN];
+            shouldShowFullscreenToolbar_
+                ? FullscreenSlidingStyle::OMNIBOX_TABS_PRESENT
+                : FullscreenSlidingStyle::OMNIBOX_TABS_HIDDEN];
 }
 
 - (BOOL)isInAnyFullscreenMode {
   return [self isInImmersiveFullscreen] || [self isInAppKitFullscreen];
 }
 
 - (BOOL)isInImmersiveFullscreen {
   return fullscreenWindow_.get() != nil || enteringImmersiveFullscreen_;
 }
 
@@ skipping 62 matching lines @@
                : [barVisibilityLocks_ count];
 }
 
 - (void)lockBarVisibilityForOwner:(id)owner withAnimation:(BOOL)animate {
   if (![self isBarVisibilityLockedForOwner:owner]) {
     [barVisibilityLocks_ addObject:owner];
 
     // If enabled, show the overlay if necessary (and if the fullscreen
     // toolbar is hidden).
     if (barVisibilityUpdatesEnabled_) {
-      [fullscreenToolbarController_ ensureOverlayShownWithAnimation:animate];
+      [fullscreenToolbarController_ lockBarVisibilityWithAnimation:animate];
     }
   }
 }
 
 - (void)releaseBarVisibilityForOwner:(id)owner withAnimation:(BOOL)animate {
   if ([self isBarVisibilityLockedForOwner:owner]) {
     [barVisibilityLocks_ removeObject:owner];
 
     // If enabled, hide the overlay if necessary (and if the fullscreen
     // toolbar is hidden).
     if (barVisibilityUpdatesEnabled_ &&
         ![barVisibilityLocks_ count]) {
-      [fullscreenToolbarController_ ensureOverlayHiddenWithAnimation:animate];
+      [fullscreenToolbarController_ releaseBarVisibilityWithAnimation:animate];
     }
   }
 }
 
 - (BOOL)floatingBarHasFocus {
   NSResponder* focused = [[self window] firstResponder];
   return [focused isKindOfClass:[AutocompleteTextFieldEditor class]];
 }
 
 - (ExclusiveAccessController*)exclusiveAccessController {
@@ skipping 32 matching lines @@
 
 - (NSRect)savedRegularWindowFrame {
   return savedRegularWindowFrame_;
 }
 
 - (BOOL)isFullscreenTransitionInProgress {
   return enteringAppKitFullscreen_ || exitingAppKitFullscreen_;
 }
 
 @end  // @implementation BrowserWindowController(WindowType)