Mac: Fix sheet positioning on popup windows.

chrome/browser/ui/cocoa/browser_window_controller_private.mm

 // Copyright (c) 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 "chrome/browser/ui/cocoa/browser_window_controller_private.h"
 
 #include <cmath>
 
 #include "base/command_line.h"
 #include "base/mac/bind_objc_block.h"
@@ skipping 153 matching lines @@
   windowPreferences->SetBoolean("maximized", false);
   windowPreferences->SetBoolean("always_on_top", false);
   windowPreferences->SetInteger("work_area_left", workArea.x());
   windowPreferences->SetInteger("work_area_top", workArea.y());
   windowPreferences->SetInteger("work_area_right", workArea.right());
   windowPreferences->SetInteger("work_area_bottom", workArea.bottom());
 }
 
 - (NSRect)window:(NSWindow*)window
 willPositionSheet:(NSWindow*)sheet
-       usingRect:(NSRect)defaultSheetRect {
+       usingRect:(NSRect)defaultSheetLocation {
   // Position the sheet as follows:
+  //  - If the bookmark bar is shown (attached to the normal toolbar), position
+  //    the sheet below the bookmark bar.
   //  - If the bookmark bar is hidden or shown as a bubble (on the NTP when the
   //    bookmark bar is disabled), position the sheet immediately below the
   //    normal toolbar.
-  //  - If the bookmark bar is shown (attached to the normal toolbar), position
-  //    the sheet below the bookmark bar.
   //  - If the bookmark bar is currently animating, position the sheet according
   //    to where the bar will be when the animation ends.
-  CGFloat defaultSheetY = defaultSheetRect.origin.y;
-  switch ([bookmarkBarController_ currentState]) {
-    case BookmarkBar::SHOW: {
-      NSRect bookmarkBarFrame = [[bookmarkBarController_ view] frame];
-      defaultSheetY = bookmarkBarFrame.origin.y;
-      break;
-    }
-    case BookmarkBar::HIDDEN:
-    case BookmarkBar::DETACHED: {
-      if ([self hasToolbar]) {
-        NSRect toolbarFrame = [[toolbarController_ view] frame];
-        defaultSheetY = toolbarFrame.origin.y;
-      } else {
-        // The toolbar is not shown in application mode. The sheet should be
-        // located at the top of the window, under the title of the window.
-        defaultSheetY = NSHeight([[window contentView] frame]) -
-                        defaultSheetRect.size.height;

[Andre, 2015/01/06 20:55:33]

This height has no meaning according to AppKit docs, defaultSheetRect is not
actually the frame of the sheet.

-      }
-      break;
-    }
+  CGFloat defaultSheetY = defaultSheetLocation.origin.y;
+  if ([self supportsBookmarkBar] &&

[Andre, 2015/01/06 20:55:33]

This was the missing check that caused the sheet to be positioned incorrectly on
popup windows.

+      [bookmarkBarController_ currentState] == BookmarkBar::SHOW) {
+    defaultSheetY = NSMinY([[bookmarkBarController_ view] frame]);
+  } else if ([self hasToolbar]) {
+    defaultSheetY = NSMinY([[toolbarController_ view] frame]);
+  } else {
+    // The toolbar is not shown in popup and application modes. The sheet
+    // should be located at the top of the window, under the title of the
+    // window.
+    defaultSheetY = NSMaxY([[window contentView] frame]);
   }
 
   // AppKit may shift the window up to fit the sheet on screen, but it will
   // never adjust the height of the sheet, or the origin of the sheet relative
   // to the window. Adjust the origin to prevent sheets from extending past the
   // bottom of the screen.
 
   // Don't allow the sheet to extend past the bottom of the window. This logic
   // intentionally ignores the size of the screens, since the window might span
   // multiple screens, and AppKit may reposition the window.
   CGFloat sheetHeight = NSHeight([sheet frame]);
   defaultSheetY = std::max(defaultSheetY, sheetHeight);
 
   // It doesn't make sense to provide a Y higher than the height of the window.
   CGFloat windowHeight = NSHeight([window frame]);
   defaultSheetY = std::min(defaultSheetY, windowHeight);
 
-  defaultSheetRect.origin.y = defaultSheetY;
-  return defaultSheetRect;
+  defaultSheetLocation.origin.y = defaultSheetY;
+  return defaultSheetLocation;
 }
 
 - (void)layoutSubviews {
   // Suppress title drawing if necessary.
   if ([self.window respondsToSelector:@selector(setShouldHideTitle:)])
     [(id)self.window setShouldHideTitle:![self hasTitleBar]];
 
   [bookmarkBarController_ updateHiddenState];
   [self updateSubviewZOrder];
 
@@ skipping 788 matching lines @@
   }
   if (!enteringAppKitFullscreen_)
     return NO;
   if (enteringAppKitFullscreenOnPrimaryScreen_)
     return NO;
 
   return YES;
 }
 
 @end  // @implementation BrowserWindowController(Private)