[Mac] Retain location bar focus on switching to fullscreen and back.

chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_controller.mm

 // Copyright 2016 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/fullscreen_toolbar_controller.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/profiles/profile.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/fullscreen/fullscreen_menubar_tracker.h"
@@ skipping 29 matching lines @@
 
 - (void)dealloc {
   DCHECK(!inFullscreenMode_);
   [super dealloc];
 }
 
 - (void)enterFullscreenMode {
   DCHECK(!inFullscreenMode_);
   inFullscreenMode_ = YES;
 
+  // If the location bar is the first responder, don't let the toolbar hide.
+  // This is a special signal to -mustShowFullscreenToolbar that the toolbar
+  // should remain visible during the transition to fullscreen.
+  if ([browserController_ locationBarHasFocus]) {
+    [visibilityLockController_ lockToolbarVisibilityForOwner:self
+                                               withAnimation:NO];
+  }
+
   [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
                         animationController:animationController_.get()]);
   }
+
+  // Let the location bar keep the toolbar locked in place from here on out
+  // (if it's the first responder).
+  [visibilityLockController_ releaseToolbarVisibilityForOwner:self
+                                                withAnimation:YES];
 }
 
 - (void)exitFullscreenMode {
   DCHECK(inFullscreenMode_);
   inFullscreenMode_ = NO;
 
   animationController_->StopAnimationAndTimer();
   [[NSNotificationCenter defaultCenter] removeObserver:self];
 
   menubarTracker_.reset();
@@ skipping 52 matching lines @@
   }
   layout.menubarOffset *= -[browserController_ menubarHeight];
 
   return layout;
 }
 
 - (BOOL)mustShowFullscreenToolbar {
   if (!inFullscreenMode_)
     return NO;
 
+  // Check if the fullscreen toolbar controller wants the toolbar to remain
+  // visible.
+  if ([visibilityLockController_ isToolbarVisibilityLockedForOwner:self]) {
+    return YES;
+  }
+
   if (toolbarStyle_ == FullscreenToolbarStyle::TOOLBAR_PRESENT)
     return YES;
 
   if (toolbarStyle_ == FullscreenToolbarStyle::TOOLBAR_NONE)
     return NO;
 
   FullscreenMenubarState menubarState = [menubarTracker_ state];
   return menubarState == FullscreenMenubarState::SHOWN ||
          [mouseTracker_ mouseInsideTrackingArea] ||
          [visibilityLockController_ isToolbarVisibilityLocked];
@@ skipping 57 matching lines @@
 
 - (void)setToolbarStyle:(FullscreenToolbarStyle)style {
   toolbarStyle_ = style;
 }
 
 - (void)setTestFullscreenMode:(BOOL)isInFullscreen {
   inFullscreenMode_ = isInFullscreen;
 }
 
 @end