Mac: Fix (window modal) sheet placement when bookmark bar is present.

chrome/browser/cocoa/browser_window_controller.mm

 // Copyright (c) 2009 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.
 
 #include <Carbon/Carbon.h>
 
 #include "base/mac_util.h"
 #include "base/scoped_nsdisable_screen_updates.h"
 #import "base/scoped_nsobject.h"
 #include "base/sys_string_conversions.h"
@@ skipping 1207 matching lines @@
   windowPreferences->SetBoolean(L"always_on_top", false);
   windowPreferences->SetInteger(L"work_area_left", workArea.x());
   windowPreferences->SetInteger(L"work_area_top", workArea.y());
   windowPreferences->SetInteger(L"work_area_right", workArea.right());
   windowPreferences->SetInteger(L"work_area_bottom", workArea.bottom());
 }
 
 - (NSRect)window:(NSWindow*)window
 willPositionSheet:(NSWindow*)sheet
        usingRect:(NSRect)defaultSheetRect {
-  // Any sheet should come from right above the visible content area.
+  // Any sheet should come from right above the apparent content area, or
+  // equivalently right below the apparent toolbar.
   NSRect toolbarFrame = [[toolbarController_ view] frame];
-  NSRect infobarFrame = [[infoBarContainerController_ view] frame];
-  defaultSheetRect.origin.y = toolbarFrame.origin.y - infobarFrame.size.height;
+  defaultSheetRect.origin.y = toolbarFrame.origin.y;
+
+  // Position as follows:
+  //  - On a normal (non-NTP) page, position the sheet under the bookmark bar if
+  //    it's visible. Else put it immediately below the normal toolbar.
+  //  - On the NTP, if the bookmark bar is enabled ("always visible"), then it
+  //    looks like a normal bookmark bar, so position the sheet under it; if it
+  //    isn't enabled, the bookmark bar will look as if it's a part of the
+  //    content area, so just put it immediately below the toolbar.
+  if ([bookmarkBarController_ isVisible] &&
+      (![bookmarkBarController_ isNewTabPage] ||
+        [bookmarkBarController_ isAlwaysVisible])) {
+    NSRect bookmarkBarFrame = [[bookmarkBarController_ view] frame];
+    defaultSheetRect.origin.y -= bookmarkBarFrame.size.height;

[Scott Hess - ex-Googler, 2009/10/26 17:04:07]

What is wrong with bookmarkBarFrame.origin.y, here?  Would seem more robust.

Otherwise, document your assumption that the views are adjacent:
  DCHECK_EQ(NSMaxY(bookmarkBarFrame), NSMinY(toolbarFrame));

+  }
 
   return defaultSheetRect;
 }
 
 // Undocumented method for multi-touch gestures in 10.5. Future OS's will
 // likely add a public API, but the worst that will happen is that this will
 // turn into dead code and just won't get called.
 - (void)swipeWithEvent:(NSEvent*)event {
   // Map forwards and backwards to history; left is positive, right is negative.
   unsigned int command = 0;
@@ skipping 294 matching lines @@
   if (frameOverlayInactiveImage) {
     [theme setValue:frameOverlayInactiveImage
        forAttribute:@"overlay"
               style:GTMThemeStyleWindow
               state:GTMThemeStateInactiveWindow];
   }
 
   return theme;
 }
 @end