Cleaned up webWillAddPendingURL:transition: callback.

ios/chrome/browser/tabs/tab.mm

 // Copyright 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 "ios/chrome/browser/tabs/tab.h"
 
 #import <CoreLocation/CoreLocation.h>
 #import <UIKit/UIKit.h>
 
 #include <utility>
@@ skipping 1321 matching lines @@
 // destination URL is included in the |url| parameter.
 // Warning: because of the present design it is possible for malicious websites
 // to invoke superflous instances of this delegate with artibrary URLs.
 // Ensure there is nothing here that could be a risk to the user beyond mild
 // confusion in that event (e.g. progress bar starting unexpectedly).
 - (void)webWillAddPendingURL:(const GURL&)url
                   transition:(ui::PageTransition)transition {
   DCHECK(self.webController.loadPhase == web::LOAD_REQUESTED);
   DCHECK([self navigationManager]);
 
-  // Move the toolbar to visible during page load.
-  [_fullScreenController disableFullScreen];
-
   BOOL isUserNavigationEvent =
       (transition & ui::PAGE_TRANSITION_IS_REDIRECT_MASK) == 0;
   // Check for link-follow clobbers. These are changes where there is no
   // pending entry (since that means the change wasn't caused by this class),
   // and where the URL changes (to avoid counting page resurrection).
   // TODO(crbug.com/546401): Consider moving this into NavigationManager, or
   // into a NavigationManager observer callback, so it doesn't need to be
   // checked in several places.
   if (isUserNavigationEvent && !_isPrerenderTab &&
       ![self navigationManager]->GetPendingItem() &&
       url != self.lastCommittedURL) {
     base::RecordAction(base::UserMetricsAction("MobileTabClobbered"));
     if ([_parentTabModel tabUsageRecorder])
       [_parentTabModel tabUsageRecorder]->RecordPageLoadStart(self);
   }
   if (![self navigationManager]->GetPendingItem()) {
     // Reset |isVoiceSearchResultsTab| since a new page is being navigated to.
     self.isVoiceSearchResultsTab = NO;
   }
 }
 
 - (void)webState:(web::WebState*)webState
     didStartNavigation:(web::NavigationContext*)navigation {
   if ([_parentTabModel tabUsageRecorder] &&
       PageTransitionCoreTypeIs(navigation->GetPageTransition(),
                                ui::PAGE_TRANSITION_RELOAD)) {
     [_parentTabModel tabUsageRecorder]->RecordReload(self);
   }
 
+  // Move the toolbar to visible during page load.
+  // TODO(crbug.com/707305): Do not disable fullscreen for same-document
+  // navigations.
+  [_fullScreenController disableFullScreen];
+
   [self.dialogDelegate cancelDialogForTab:self];
   [_parentTabModel notifyTabChanged:self];
   [_openInController disable];
   [[NSNotificationCenter defaultCenter]
       postNotificationName:
           kTabClosingCurrentDocumentNotificationForCrashReporting
                     object:self];
 }
 
 - (void)webState:(web::WebState*)webState
@@ skipping 428 matching lines @@
 
 - (TabModel*)parentTabModel {
   return _parentTabModel;
 }
 
 - (FormInputAccessoryViewController*)inputAccessoryViewController {
   return _inputAccessoryViewController;
 }
 
 @end