Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7067)

Unified Diff: chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_controller.mm

Issue 2542803002: [Mac] Fullscreen Toolbar Animation Fix (Closed)
Patch Set: Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_controller.mm
diff --git a/chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_controller.mm b/chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_controller.mm
index 63c3b141a5f08626c0be02c44e629a253313a3b7..b9b3cad869660edb45807efdb2779a7506c848cc 100644
--- a/chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_controller.mm
+++ b/chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_controller.mm
@@ -106,12 +106,12 @@ const CGFloat kToolbarVerticalOffset = -22;
case FullscreenToolbarStyle::TOOLBAR_NONE:
return kHideFraction;
case FullscreenToolbarStyle::TOOLBAR_HIDDEN:
- if ([self mustShowFullscreenToolbar])
- return kShowFraction;
-
if (animationController_->IsAnimationRunning())
return animationController_->GetToolbarFractionFromProgress();
+ if ([self mustShowFullscreenToolbar])
+ return kShowFraction;
+
return [menubarTracker_ menubarFraction];
}
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698