[Mac] Fullscreen Toolbar Animation Fix

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 88 matching lines @@
 - (CGFloat)toolbarFraction {
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode))
     return kHideFraction;
 
   switch (toolbarStyle_) {
     case FullscreenToolbarStyle::TOOLBAR_PRESENT:
       return kShowFraction;
     case FullscreenToolbarStyle::TOOLBAR_NONE:
       return kHideFraction;
     case FullscreenToolbarStyle::TOOLBAR_HIDDEN:
+      if (animationController_->IsAnimationRunning())
+        return animationController_->GetToolbarFractionFromProgress();
+
       if ([self mustShowFullscreenToolbar])
         return kShowFraction;
 
-      if (animationController_->IsAnimationRunning())
-        return animationController_->GetToolbarFractionFromProgress();
-
       return [menubarTracker_ menubarFraction];
   }
 }
 
 - (FullscreenToolbarLayout)computeLayout {
   FullscreenToolbarLayout layout;
   layout.toolbarStyle = toolbarStyle_;
   layout.toolbarFraction = [self toolbarFraction];
 
   if ([browserController_ isInAppKitFullscreen]) {
@@ skipping 57 matching lines @@
 
 - (BrowserWindowController*)browserWindowController {
   return browserController_;
 }
 
 - (FullscreenToolbarVisibilityLockController*)visibilityLockController {
   return visibilityLockController_.get();
 }
 
 @end