diff options
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/cocoa/bookmark_bar_folder_controller.mm | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/chrome/browser/cocoa/bookmark_bar_folder_controller.mm b/chrome/browser/cocoa/bookmark_bar_folder_controller.mm index b17b19c..3afaa18 100644 --- a/chrome/browser/cocoa/bookmark_bar_folder_controller.mm +++ b/chrome/browser/cocoa/bookmark_bar_folder_controller.mm @@ -261,12 +261,14 @@ // Make the window fit on screen, with a distance of at least |padding| to // the sides. - const CGFloat padding = 8; - NSRect screenFrame = [[[self window] screen] frame]; - if (NSMaxX(windowFrame) + padding > NSMaxX(screenFrame)) - windowFrame.origin.x -= NSMaxX(windowFrame) + padding - NSMaxX(screenFrame); - else if (NSMinX(windowFrame) - padding < NSMinX(screenFrame)) - windowFrame.origin.x += NSMinX(screenFrame) - NSMinX(windowFrame) + padding; + if ([[self window] screen]) { // nil in unit tests + const CGFloat padding = 8; + NSRect screen = [[[self window] screen] frame]; + if (NSMaxX(windowFrame) + padding > NSMaxX(screen)) + windowFrame.origin.x -= NSMaxX(windowFrame) + padding - NSMaxX(screen); + else if (NSMinX(windowFrame) - padding < NSMinX(screen)) + windowFrame.origin.x += NSMinX(screen) - NSMinX(windowFrame) + padding; + } [[self window] setFrame:windowFrame display:YES]; |