[Mac] Fullscreen layout issues

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"
 #import "chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_animation_controller.h"
 #import "chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_mouse_tracker.h"
 #import "chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_visibility_lock_controller.h"
 #import "chrome/browser/ui/cocoa/fullscreen/immersive_fullscreen_controller.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 
 namespace {
 
 // Visibility fractions for the menubar and toolbar.
 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
 
 - (id)initWithBrowserController:(BrowserWindowController*)controller {
   if ((self = [super init])) {
     browserController_ = controller;
     animationController_.reset(new FullscreenToolbarAnimationController(self));
     visibilityLockController_.reset(
         [[FullscreenToolbarVisibilityLockController alloc]
@@ skipping 75 matching lines @@
 
       return [menubarTracker_ menubarFraction];
   }
 }
 
 - (FullscreenToolbarLayout)computeLayout {
   FullscreenToolbarLayout layout;
   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;
 }
 
 - (BOOL)mustShowFullscreenToolbar {
   if (!inFullscreenMode_)
     return NO;
 
   if (toolbarStyle_ == FullscreenToolbarStyle::TOOLBAR_PRESENT)
     return YES;
@@ skipping 64 matching lines @@
 }
 
 - (void)setToolbarStyle:(FullscreenToolbarStyle)style {
   toolbarStyle_ = style;
 }
 
 - (void)setTestFullscreenMode:(BOOL)isInFullscreen {
   inFullscreenMode_ = isInFullscreen;
 }
 
-- (CGFloat)toolbarVerticalOffset {
-  return kToolbarVerticalOffset;
-}
-
 @end