[Mac] Fix for fullscreen toolbar layout issues

chrome/browser/ui/cocoa/fullscreen_toolbar_controller.mm

Index: chrome/browser/ui/cocoa/fullscreen_toolbar_controller.mm
diff --git a/chrome/browser/ui/cocoa/fullscreen_toolbar_controller.mm b/chrome/browser/ui/cocoa/fullscreen_toolbar_controller.mm
index d1f84647fc48098d562a4bddba2c69078fba6f85..323680b4afc7f12a1e82c28b80bab7163554db6e 100644
--- a/chrome/browser/ui/cocoa/fullscreen_toolbar_controller.mm
+++ b/chrome/browser/ui/cocoa/fullscreen_toolbar_controller.mm
@@ -60,7 +60,7 @@ const CGFloat kToolbarVerticalOffset = 22;
   DCHECK(!inFullscreenMode_);
   inFullscreenMode_ = YES;
 
-  [self updateToolbarStyle];
+  [self updateToolbarStyleExitingTabFullscreen:NO];
 
   if ([browserController_ isInImmersiveFullscreen]) {
     immersiveFullscreenController_.reset([[ImmersiveFullscreenController alloc]
@@ -104,10 +104,11 @@ const CGFloat kToolbarVerticalOffset = 22;
   animationController_->AnimateToolbarForTabstripChanges();
 }
 
-- (void)updateToolbarStyle {
+- (void)updateToolbarStyleExitingTabFullscreen:(BOOL)isExitingTabFullscreen {
   FullscreenToolbarStyle oldStyle = toolbarStyle_;
 
-  if ([browserController_ isFullscreenForTabContentOrExtension]) {
+  if ([browserController_ isFullscreenForTabContentOrExtension] &&
+      !isExitingTabFullscreen) {
     toolbarStyle_ = FullscreenToolbarStyle::TOOLBAR_NONE;
   } else {
     PrefService* prefs = [browserController_ profile]->GetPrefs();