summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorerg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-28 18:10:23 +0000
committererg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-28 18:10:23 +0000
commitf61f331824ac9c98684a886be0d918aefe69d3ce (patch)
tree153e39c35a95ac3042ddcee3203b53fa1c0fd924
parent6e7a326e888615deef8c055785865aed747e50a6 (diff)
downloadchromium_src-f61f331824ac9c98684a886be0d918aefe69d3ce.zip
chromium_src-f61f331824ac9c98684a886be0d918aefe69d3ce.tar.gz
chromium_src-f61f331824ac9c98684a886be0d918aefe69d3ce.tar.bz2
Mac: Sheets should be positioned between the content and everything above it.
BUG=17615 Review URL: http://codereview.chromium.org/219032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27378 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/cocoa/browser_window_controller.mm7
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/browser/cocoa/browser_window_controller.mm b/chrome/browser/cocoa/browser_window_controller.mm
index 99ef336..b8236e4 100644
--- a/chrome/browser/cocoa/browser_window_controller.mm
+++ b/chrome/browser/cocoa/browser_window_controller.mm
@@ -1155,8 +1155,11 @@ willPositionSheet:(NSWindow*)sheet
- (NSRect)window:(NSWindow*)window
willPositionSheet:(NSWindow*)sheet
usingRect:(NSRect)defaultSheetRect {
- NSRect windowFrame = [window frame];
- defaultSheetRect.origin.y = windowFrame.size.height - 10;
+ // Any sheet should come from right above the visible content area.
+ NSRect toolbarFrame = [[toolbarController_ view] frame];
+ NSRect infobarFrame = [[infoBarContainerController_ view] frame];
+ defaultSheetRect.origin.y = toolbarFrame.origin.y - infobarFrame.size.height;
+
return defaultSheetRect;
}