[Mac] Fullscreen layout issues

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

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 137324548c493b018951b5e1b7e6e116e0870719..f80e083fb15fb17e8d608eba1fa2eee3944f7475 100644
--- a/chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_controller.mm
+++ b/chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_controller.mm
@@ -21,11 +21,6 @@ namespace {
 const CGFloat kHideFraction = 0.0;
 const CGFloat kShowFraction = 1.0;
 
-// The amount by which the toolbar is offset downwards (to avoid the menu)
-// when the toolbar style is TOOLBAR_HIDDEN. (We can't use
-// |-[NSMenu menuBarHeight]| since it returns 0 when the menu bar is hidden.)
-const CGFloat kToolbarVerticalOffset = -22;
-
 }  // end namespace
 
 @implementation FullscreenToolbarController
@@ -121,13 +116,14 @@ const CGFloat kToolbarVerticalOffset = -22;
   layout.toolbarStyle = toolbarStyle_;
   layout.toolbarFraction = [self toolbarFraction];
 
+  // Calculate how much the toolbar is offset downwards to avoid the menu.
   if ([browserController_ isInAppKitFullscreen]) {
     layout.menubarOffset = [menubarTracker_ menubarFraction];
   } else {
     layout.menubarOffset =
         [immersiveFullscreenController_ shouldShowMenubar] ? 1 : 0;
   }
-  layout.menubarOffset *= kToolbarVerticalOffset;
+  layout.menubarOffset *= -[browserController_ menubarHeight];
 
   return layout;
 }
@@ -212,8 +208,4 @@ const CGFloat kToolbarVerticalOffset = -22;
   inFullscreenMode_ = isInFullscreen;
 }
 
-- (CGFloat)toolbarVerticalOffset {
-  return kToolbarVerticalOffset;
-}
-
 @end