Chromium Code Reviews| Index: chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.mm |
| diff --git a/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.mm b/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.mm |
| index dbd18153cf0dca9294be013b4f8d846766778d47..d0cf0ea03ef528ee5f53d92b86b661bb9fc1b6c2 100644 |
| --- a/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.mm |
| +++ b/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.mm |
| @@ -120,10 +120,9 @@ const float kHideDuration = 0.7; |
| [self showButtons:NO]; |
| [self hideSoon]; |
| } |
| - NSRect windowFrame = [owner_ window].frame; |
| [tweaker_ tweakUI:info_bubble]; |
| - [self positionInWindowAtTop:NSHeight(windowFrame) width:NSWidth(windowFrame)]; |
| [[owner_ window] addChildWindow:info_bubble ordered:NSWindowAbove]; |
| + [owner_ layoutSubviews]; |
| [info_bubble orderFront:self]; |
| } |
| @@ -136,9 +135,14 @@ const float kHideDuration = 0.7; |
| - (void)positionInWindowAtTop:(CGFloat)maxY width:(CGFloat)maxWidth { |
| NSRect windowFrame = [self window].frame; |
| + NSRect ownerWindowFrame = [owner_ window].frame; |
| NSPoint origin; |
| origin.x = (int)(maxWidth/2 - NSWidth(windowFrame)/2); |
| origin.y = maxY - NSHeight(windowFrame); |
|
jeremya
2012/05/07 01:23:41
These two lines are dead code now.
|
| + |
| + origin.x = ownerWindowFrame.origin.x + |
| + (int)(NSWidth(ownerWindowFrame)/2 - NSWidth(windowFrame)/2); |
| + origin.y = ownerWindowFrame.origin.y + maxY - NSHeight(windowFrame); |
| [[self window] setFrameOrigin:origin]; |
| } |
| @@ -169,8 +173,7 @@ const float kHideDuration = 0.7; |
| // Relayout. A bit jumpy, but functional. |
| [tweaker_ tweakUI:[self window]]; |
| - NSRect windowFrame = [owner_ window].frame; |
| - [self positionInWindowAtTop:NSHeight(windowFrame) width:NSWidth(windowFrame)]; |
| + [owner_ layoutSubviews]; |
| } |
| // Called when someone clicks on the embedded link. |