[Mac] Fullscreen Toolbar Edge Cases

chrome/browser/ui/cocoa/browser_window_controller.mm

Index: chrome/browser/ui/cocoa/browser_window_controller.mm
diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm
index b92a19242a65be37e02e77886b07672b2e087612..e2b73ed29f273a6d15ec70049383d6a28dfd8093 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller.mm
@@ -1870,13 +1870,15 @@ willAnimateFromState:(BookmarkBar::State)oldState
     (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 {
@@ -1900,8 +1902,9 @@ willAnimateFromState:(BookmarkBar::State)oldState
 
   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 {
@@ -1984,7 +1987,7 @@ willAnimateFromState:(BookmarkBar::State)oldState
     // If enabled, show the overlay if necessary (and if the fullscreen
     // toolbar is hidden).
     if (barVisibilityUpdatesEnabled_) {
-      [fullscreenToolbarController_ ensureOverlayShownWithAnimation:animate];
+      [fullscreenToolbarController_ lockBarVisibilityWithAnimation:animate];
     }
   }
 }
@@ -1997,7 +2000,7 @@ willAnimateFromState:(BookmarkBar::State)oldState
     // toolbar is hidden).
     if (barVisibilityUpdatesEnabled_ &&
         ![barVisibilityLocks_ count]) {
-      [fullscreenToolbarController_ ensureOverlayHiddenWithAnimation:animate];
+      [fullscreenToolbarController_ releaseBarVisibilityWithAnimation:animate];
     }
   }
 }