[Mac] Refactor the Fullscreen Toolbar Visibility Locks

chrome/browser/ui/cocoa/fullscreen_toolbar_controller.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/fullscreen_toolbar_controller.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #import "base/mac/mac_util.h"
 #include "base/mac/sdk_forward_declarations.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/fullscreen/fullscreen_menubar_tracker.h"
 #import "chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_animation_controller.h"
 #import "chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_mouse_tracker.h"
+#import "chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_visibility_lock_controller.h"
 #include "chrome/common/chrome_switches.h"
 #include "ui/base/cocoa/appkit_utils.h"
 #import "ui/base/cocoa/nsview_additions.h"
 #import "ui/base/cocoa/tracking_area.h"
 
 namespace {
 
 // Visibility fractions for the menubar and toolbar.
 const CGFloat kHideFraction = 0.0;
 const CGFloat kShowFraction = 1.0;
@@ skipping 34 matching lines @@
 
 @synthesize slidingStyle = slidingStyle_;
 
 - (id)initWithBrowserController:(BrowserWindowController*)controller
                           style:(FullscreenSlidingStyle)style {
   if ((self = [super init])) {
     browserController_ = controller;
     systemFullscreenMode_ = base::mac::kFullScreenModeNormal;
     slidingStyle_ = style;
     animationController_.reset(new FullscreenToolbarAnimationController(self));
+    visibilityLockController_.reset(
+        [[FullscreenToolbarVisibilityLockController alloc]
+            initWithFullscreenToolbarController:self
+                            animationController:animationController_.get()]);
   }
 
   return self;
 }
 
 - (void)dealloc {
   DCHECK(!inFullscreenMode_);
   [super dealloc];
 }
 
@@ skipping 40 matching lines @@
 }
 
 - (void)windowDidBecomeMain:(NSNotification*)notification {
   [self updateMenuBarAndDockVisibility];
 }
 
 - (void)windowDidResignMain:(NSNotification*)notification {
   [self updateMenuBarAndDockVisibility];
 }
 
-- (void)ensureOverlayShownWithAnimation:(BOOL)animate {
-  animationController_->AnimateToolbarIn();
-}
-
-- (void)ensureOverlayHiddenWithAnimation:(BOOL)animate {
-  animationController_->AnimateToolbarOutIfPossible();
-}
-
 // Cancels any running animation and timers.
 - (void)cancelAnimationAndTimer {
   animationController_->StopAnimationAndTimer();
 }
 
 - (void)revealToolbarForTabStripChanges {
   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableFullscreenToolbarReveal)) {
     return;
   }
@@ skipping 21 matching lines @@
   // In AppKit fullscreen, moving the mouse to the top of the screen toggles
   // menu visibility. Replicate the same effect for immersive fullscreen.
   if ([browserController_ isInImmersiveFullscreen])
     [self updateMenuBarAndDockVisibility];
 }
 
 - (BrowserWindowController*)browserWindowController {
   return browserController_;
 }
 
+- (FullscreenToolbarVisibilityLockController*)visibilityLockController {
+  return visibilityLockController_.get();
+}
+
 // This method works, but is fragile.
 //
 // It gets used during view layout, which sometimes needs to be done at the
 // beginning of an animation. As such, this method needs to reflect the
 // menubarOffset expected at the end of the animation. This information is not
 // readily available. (The layout logic needs a refactor).
 //
 // For AppKit Fullscreen, the menubar always starts hidden, and
 // menubarFraction_ always starts at 0, so the logic happens to work. For
 // Immersive Fullscreen, this class controls the visibility of the menu bar, so
@@ skipping 34 matching lines @@
 
   if (slidingStyle_ == FullscreenSlidingStyle::OMNIBOX_TABS_PRESENT)
     return YES;
 
   if (slidingStyle_ == FullscreenSlidingStyle::OMNIBOX_TABS_NONE)
     return NO;
 
   FullscreenMenubarState menubarState = [menubarTracker_ state];
   return menubarState == FullscreenMenubarState::SHOWN ||
          [mouseTracker_ mouseInsideTrackingArea] ||
-         [browserController_ isBarVisibilityLockedForOwner:nil];
+         [visibilityLockController_ isToolbarVisibilityLocked];
 }
 
 - (BOOL)isFullscreenTransitionInProgress {
   return [browserController_ isFullscreenTransitionInProgress];
 }
 
 - (BOOL)isInFullscreen {
   return inFullscreenMode_;
 }
 
@@ skipping 62 matching lines @@
 
   // No more calls back up to the BWC.
   browserController_ = nil;
 }
 
 - (BOOL)shouldShowMenubarInImmersiveFullscreen {
   return [self doesScreenHaveMenuBar] && [self toolbarFraction] > 0.99;
 }
 
 @end