[Mac] Fullscreen Toolbar Edge Cases

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 667f65ecac082eab9b0dd7279c9cb341a0dee689..caef203e2e30bb275279d13171c8f2408989b57a 100644
--- a/chrome/browser/ui/cocoa/fullscreen_toolbar_controller.h
+++ b/chrome/browser/ui/cocoa/fullscreen_toolbar_controller.h
@@ -22,6 +22,14 @@ enum SlidingStyle {
   OMNIBOX_TABS_NONE,         // Tab strip and omnibox both hidden and never
                              // shown.
 };
+
+enum HiddenToolbarState {
+  TOOLBAR_SHOWN = 0,      // Toolbar fully visible, toolbarFraction is 1.0.
+  TOOLBAR_HIDDEN,         // Toolbar fully hidden, toolbarFraction is 0.0.
+  TOOLBAR_TRANSITIONING,  // Toolbar in progress of showing/hiding.
+                          // toolbarFraction is (0.0, 1.0).
+};
+
 }  // namespace fullscreen_mac
 
 // Provides a controller to fullscreen toolbar for a single browser
@@ -78,8 +86,9 @@ enum SlidingStyle {
   // Only used in AppKit Fullscreen.
   CGFloat menubarFraction_;
 
-  // The toolbar fraction set by the menu progress.
-  CGFloat toolbarFractionFromMenuProgress_;
+  // The state of the toolbar when the sliding style is set to
+  // OMNIBOX_TABS_HIDDEN.
+  fullscreen_mac::HiddenToolbarState hiddenToolbarState_;
 
   // A Carbon event handler that tracks the revealed fraction of the menu bar.
   EventHandlerRef menuBarTrackingHandler_;
@@ -87,11 +96,9 @@ enum SlidingStyle {
   // True when the toolbar is dropped to show tabstrip changes.
   BOOL isRevealingToolbarForTabStripChanges_;
 
-  // True when the toolbar should be animated back out via a DropdownAnimation.
-  // This is set and unset in hideTimer:. It's set to YES before it calls
-  // animateToolbarVisibility: and then set to NO after the animation has
-  // started.
-  BOOL shouldAnimateToolbarOut_;
+  // True when the menubar is disappearing/gone and the toolbar should still be
+  // shown. Set to false after the toolbar hides.
+  BOOL shouldShowToolbarWithoutMenu_;
 }
 
 @property(nonatomic, assign) fullscreen_mac::SlidingStyle slidingStyle;
@@ -118,8 +125,8 @@ enum SlidingStyle {
 
 // Informs the controller that the overlay should be shown/hidden, possibly
 // with animation.
-- (void)ensureOverlayShownWithAnimation:(BOOL)animate;
-- (void)ensureOverlayHiddenWithAnimation:(BOOL)animate;
+- (void)showToolbarIfPossibleWithAnimation:(BOOL)animate;
+- (void)hideToolbarIfPossibleWithAnimation:(BOOL)animate;
 
 // Cancels any running animation and timers.
 - (void)cancelAnimationAndTimer;