[Mac] Refactor the fullscreen toolbar animation

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 1932 matching lines @@
   return owner ? [barVisibilityLocks_ containsObject:owner]
                : [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_ lockBarVisibilityWithAnimation:animate];
-    }
+    if (barVisibilityUpdatesEnabled_)
+      [fullscreenToolbarController_ ensureOverlayShownWithAnimation: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_ releaseBarVisibilityWithAnimation:animate];
-    }
+    if (barVisibilityUpdatesEnabled_ && ![barVisibilityLocks_ count])
+      [fullscreenToolbarController_ ensureOverlayHiddenWithAnimation:animate];
   }
 }
 
 - (BOOL)floatingBarHasFocus {
   NSResponder* focused = [[self window] firstResponder];
   return [focused isKindOfClass:[AutocompleteTextFieldEditor class]];
 }
 
 - (ExclusiveAccessController*)exclusiveAccessController {
   return exclusiveAccessController_.get();
@@ skipping 31 matching lines @@
 
 - (NSRect)savedRegularWindowFrame {
   return savedRegularWindowFrame_;
 }
 
 - (BOOL)isFullscreenTransitionInProgress {
   return enteringAppKitFullscreen_ || exitingAppKitFullscreen_;
 }
 
 @end  // @implementation BrowserWindowController(WindowType)