[Mac] Refactor the Fullscreen Toolbar Visibility Locks

chrome/browser/ui/cocoa/browser_window_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_CONTROLLER_H_
 #define CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_CONTROLLER_H_
 
 // A class acting as the Objective-C controller for the Browser
 // object. Handles interactions between Cocoa and the cross-platform
 // code. Each window has a single toolbar and, by virtue of being a
@@ skipping 25 matching lines @@
 class BrowserWindow;
 class BrowserWindowCocoa;
 @class BrowserWindowFullscreenTransition;
 @class DevToolsController;
 @class DownloadShelfController;
 class ExtensionKeybindingRegistryCocoa;
 class ExclusiveAccessController;
 class ExclusiveAccessContext;
 @class FindBarCocoaController;
 @class FullscreenModeController;
+@class FullscreenToolbarController;
+@class FullscreenToolbarVisibilityLockController;
 @class FullscreenWindow;
 class FullscreenLowPowerCoordinatorCocoa;
 @class InfoBarContainerController;
 class LocationBarViewMac;
 @class OverlayableContentsController;
 class PermissionBubbleCocoa;
-@class FullscreenToolbarController;
 class StatusBubbleMac;
 @class TabStripController;
 @class TabStripView;
 @class ToolbarController;
 @class TranslateBubbleController;
 
 namespace content {
 class WebContents;
 }
 
@@ skipping 111 matching lines @@
   BOOL appKitDidExitFullscreen_;
 
   // The size of the original (non-fullscreen) window.  This is saved just
   // before entering fullscreen mode and is only valid when |-isFullscreen|
   // returns YES.
   NSRect savedRegularWindowFrame_;
 
   // The proportion of the floating bar which is shown.
   CGFloat floatingBarShownFraction_;
 
-  // Various UI elements/events may want to ensure that the floating bar is
-  // visible (in presentation mode), e.g., because of where the mouse is or
-  // where keyboard focus is. Whenever an object requires bar visibility, it has
-  // itself added to |barVisibilityLocks_|. When it no longer requires bar
-  // visibility, it has itself removed.
-  base::scoped_nsobject<NSMutableSet> barVisibilityLocks_;
-
-  // Bar visibility locks and releases only result (when appropriate) in changes
-  // in visible state when the following is |YES|.
-  BOOL barVisibilityUpdatesEnabled_;
-
   // If this ivar is set to YES, layoutSubviews calls will be ignored. This is
   // used in fullscreen transition to prevent spurious resize messages from
   // being sent to the renderer, which causes the transition to be janky.
   BOOL blockLayoutSubviews_;
 
   // The Extension Command Registry used to determine which keyboard events to
   // handle.
   std::unique_ptr<ExtensionKeybindingRegistryCocoa>
       extensionKeybindingRegistry_;
 }
@@ skipping 355 matching lines @@
 - (void)resizeFullscreenWindow;
 
 // Query/lock/release the requirement that the tab strip/toolbar/attached
 // bookmark bar bar cluster is visible (e.g., when one of its elements has
 // focus). This is required for the floating bar if it's hidden in fullscreen,
 // but should also be called when not in fullscreen mode; see the comments for
 // |barVisibilityLocks_| for more details. Double locks/releases by the same
 // owner are ignored. If |animate:| is YES, then an animation may be
 // performed. In the case of multiple calls, later calls have precedence with
 // the rule that |animate:NO| has precedence over |animate:YES|. If |owner| is
-// nil in isBarVisibilityLockedForOwner, the method returns YES if there are
+// nil in isToolbarVisibilityLockedForOwner, the method returns YES if there are
 // any locks.
-- (BOOL)isBarVisibilityLockedForOwner:(id)owner;
-- (void)lockBarVisibilityForOwner:(id)owner withAnimation:(BOOL)animate;
-- (void)releaseBarVisibilityForOwner:(id)owner withAnimation:(BOOL)animate;
+- (BOOL)isToolbarVisibilityLockedForOwner:(id)owner;
+- (void)lockToolbarVisibilityForOwner:(id)owner withAnimation:(BOOL)animate;
+- (void)releaseToolbarVisibilityForOwner:(id)owner withAnimation:(BOOL)animate;
 
 // Returns YES if any of the views in the floating bar currently has focus.
 - (BOOL)floatingBarHasFocus;
 
 // Accessor for the controller managing fullscreen ExclusiveAccessContext.
 - (ExclusiveAccessController*)exclusiveAccessController;
 
 @end  // @interface BrowserWindowController(Fullscreen)
 
 
@@ skipping 43 matching lines @@
 // Returns the fullscreen toolbar controller.
 - (FullscreenToolbarController*)fullscreenToolbarController;
 
 // Sets the fullscreen toolbar controller.
 - (void)setFullscreenToolbarController:(FullscreenToolbarController*)controller;
 
 @end  // @interface BrowserWindowController (TestingAPI)
 
 
 #endif  // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_CONTROLLER_H_