[Mac] Refactor the Fullscreen Toolbar Visibility Locks

chrome/browser/ui/cocoa/fullscreen_toolbar_controller.h

Index: chrome/browser/ui/cocoa/fullscreen_toolbar_controller.h
diff --git a/chrome/browser/ui/cocoa/fullscreen_toolbar_controller.h b/chrome/browser/ui/cocoa/fullscreen_toolbar_controller.h
index 292d9dec63937e3fcc1a3fc4798c734240199242..eab78f4cf4a12a9a86cf2579df96f722da56ec14 100644
--- a/chrome/browser/ui/cocoa/fullscreen_toolbar_controller.h
+++ b/chrome/browser/ui/cocoa/fullscreen_toolbar_controller.h
@@ -15,6 +15,7 @@
 @class FullscreenMenubarTracker;
 class FullscreenToolbarAnimationController;
 @class FullscreenToolbarMouseTracker;
+@class FullscreenToolbarVisibilityLockController;
 
 enum class FullscreenSlidingStyle {
   OMNIBOX_TABS_PRESENT,  // Tab strip and omnibox both visible.
@@ -43,6 +44,11 @@ enum class FullscreenSlidingStyle {
   // object is only set when the browser is in fullscreen mode.
   base::scoped_nsobject<FullscreenMenubarTracker> menubarTracker_;
 
+  // Maintains the toolbar's visibility locks for the
+  // OMNIBOX_TABS_HIDDEN style.
+  base::scoped_nsobject<FullscreenToolbarVisibilityLockController>
+      visibilityLockController_;
+
   // Manages the toolbar animations for the OMNIBOX_TABS_HIDDEN style.
   std::unique_ptr<FullscreenToolbarAnimationController> animationController_;
 
@@ -81,11 +87,6 @@ enum class FullscreenSlidingStyle {
 - (void)enterFullscreenMode;
 - (void)exitFullscreenMode;
 
-// Informs the controller that the overlay should be shown/hidden, possibly
-// with animation.
-- (void)ensureOverlayShownWithAnimation:(BOOL)animate;
-- (void)ensureOverlayHiddenWithAnimation:(BOOL)animate;
-
 // Cancels any running animation and timers.
 - (void)cancelAnimationAndTimer;
 
@@ -127,6 +128,9 @@ enum class FullscreenSlidingStyle {
 // Returns |browserController_|.
 - (BrowserWindowController*)browserWindowController;
 
+// Returns the object in |visibilityLockController_|;
+- (FullscreenToolbarVisibilityLockController*)visibilityLockController;
+
 @end
 
 // Private methods exposed for testing.