[Mac] Fix for fullscreen toolbar layout issues

chrome/browser/ui/cocoa/fullscreen_toolbar_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/fullscreen_toolbar_controller.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #import "base/mac/mac_util.h"
@@ skipping 42 matching lines @@
 
 - (void)dealloc {
   DCHECK(!inFullscreenMode_);
   [super dealloc];
 }
 
 - (void)enterFullscreenMode {
   DCHECK(!inFullscreenMode_);
   inFullscreenMode_ = YES;
 
-  [self updateToolbarStyle];
+  [self updateToolbarStyleExitingTabFullscreen:NO];
 
   if ([browserController_ isInImmersiveFullscreen]) {
     immersiveFullscreenController_.reset([[ImmersiveFullscreenController alloc]
         initWithBrowserController:browserController_]);
     [immersiveFullscreenController_ updateMenuBarAndDockVisibility];
   } else {
     menubarTracker_.reset([[FullscreenMenubarTracker alloc]
         initWithFullscreenToolbarController:self]);
     mouseTracker_.reset([[FullscreenToolbarMouseTracker alloc]
         initWithFullscreenToolbarController:self
@@ skipping 23 matching lines @@
 
 - (void)revealToolbarForTabStripChanges {
   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableFullscreenToolbarReveal)) {
     return;
   }
 
   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();
     toolbarStyle_ = prefs->GetBoolean(prefs::kShowFullscreenToolbar)
                         ? FullscreenToolbarStyle::TOOLBAR_PRESENT
                         : FullscreenToolbarStyle::TOOLBAR_HIDDEN;
   }
 
   if (oldStyle != toolbarStyle_)
     [self updateToolbar];
@@ skipping 75 matching lines @@
   return inFullscreenMode_;
 }
 
 - (void)updateToolbarFrame:(NSRect)frame {
   if (mouseTracker_.get())
     [mouseTracker_ updateToolbarFrame:frame];
 }
 
 @end