[Mac] Reveal Fullscreen Toolbar for Tab Strip Changes

chrome/browser/ui/cocoa/presentation_mode_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/presentation_mode_controller.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #import "base/mac/mac_util.h"
@@ skipping 13 matching lines @@
 
 // The activation zone for the main menu is 4 pixels high; if we make it any
 // smaller, then the menu can be made to appear without the bar sliding down.
 const CGFloat kDropdownActivationZoneHeight = 4;
 const NSTimeInterval kDropdownAnimationDuration = 0.12;
 const NSTimeInterval kMouseExitCheckDelay = 0.1;
 // This show delay attempts to match the delay for the main menu.
 const NSTimeInterval kDropdownShowDelay = 0.3;
 const NSTimeInterval kDropdownHideDelay = 0.2;
 
+// The duration the toolbar is revealed for tab strip changes.
+const NSTimeInterval kDropdownForTabStripChangesDuration = 0.75;
+
 // The event kind value for a undocumented menubar show/hide Carbon event.
 const CGFloat kMenuBarRevealEventKind = 2004;
 
 // The amount by which the floating bar is offset downwards (to avoid the menu)
 // in presentation mode. (We can't use |-[NSMenu menuBarHeight]| since it
 // returns 0 when the menu bar is hidden.)
 const CGFloat kFloatingBarVerticalOffset = 22;
 
 OSStatus MenuBarRevealHandler(EventHandlerCallRef handler,
                               EventRef event,
@@ skipping 333 matching lines @@
     [self changeOverlayToFraction:0 withAnimation:NO];
   }
 }
 
 - (void)cancelAnimationAndTimers {
   [self cancelAllTimers];
   [currentAnimation_ stopAnimation];
   currentAnimation_.reset();
 }
 
+- (void)revealToolbarForTabStripChanges {
+  if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableFullscreenToolbarReveal)) {
+    return;
+  }
+
+  revealToolbarForTabStripChanges_ = YES;
+  [self ensureOverlayShownWithAnimation:YES delay:YES];

[Robert Sesek, 2016/06/23 14:08:24]

What if multiple tabs are inserted and this method calls more than once before
the hideTimer_ fires?

[spqchan, 2016/06/23 19:41:52]

If the method calls before it fires, then hideTimer gets invalidated before
showTimer gets kickstarted.
I removed the delay so that the dropdown will appear right away.

+}
+
 - (void)setSystemFullscreenModeTo:(base::mac::FullScreenMode)mode {
   if (mode == systemFullscreenMode_)
     return;
   if (systemFullscreenMode_ == base::mac::kFullScreenModeNormal)
     base::mac::RequestFullScreen(mode);
   else if (mode == base::mac::kFullScreenModeNormal)
     base::mac::ReleaseFullScreen(systemFullscreenMode_);
   else
     base::mac::SwitchFullScreenModes(systemFullscreenMode_, mode);
   systemFullscreenMode_ = mode;
@@ skipping 78 matching lines @@
   currentAnimation_.reset();
 
   // Invariant says that the tracking area is not installed while animations are
   // in progress. Ensure this is true.
   DCHECK(!trackingArea_);
   [self removeTrackingAreaIfNecessary];  // For paranoia.
 
   // Don't automatically set up a new tracking area. When explicitly stopped,
   // either another animation is going to start immediately or the state will be
   // changed immediately.
+  if (revealToolbarForTabStripChanges_) {
+    if (toolbarFraction_ > 0.0) {
+      // Set the timer to hide the toolbar.
+      [hideTimer_ invalidate];
+      hideTimer_.reset([[NSTimer
+          scheduledTimerWithTimeInterval:kDropdownForTabStripChangesDuration
+                                  target:self
+                                selector:@selector(hideTimerFire:)
+                                userInfo:nil
+                                 repeats:NO] retain]);
+    } else {
+      revealToolbarForTabStripChanges_ = false;

[Robert Sesek, 2016/06/23 14:08:24]

false -> NO

[spqchan, 2016/06/23 19:41:52]

Done.

+    }
+  }
 }
 
 - (void)animationDidEnd:(NSAnimation*)animation {
   [self animationDidStop:animation];
 
   // |trackingAreaBounds_| contains the correct tracking area bounds, including
   // |any updates that may have come while the animation was running. Install a
   // new tracking area with these bounds.
   [self setupTrackingArea];
 
@@ skipping 257 matching lines @@
   [self updateMenuBarAndDockVisibility];
 
   // TODO(rohitrao): Remove the Exit Fullscreen button.  http://crbug.com/35956
 }
 
 - (BOOL)shouldShowMenubarInImmersiveFullscreen {
   return [self doesScreenHaveMenuBar] && toolbarFraction_ > 0.99;
 }
 
 @end