diff options
| author | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-12 20:37:54 +0000 |
|---|---|---|
| committer | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-12 20:37:54 +0000 |
| commit | c11578fbcd901ac9194683118e357726b567b6a6 (patch) | |
| tree | 101eea306c98f88653358eea26ae6034cb856431 | |
| parent | a784acb8226bc7097803f2f3e5ffd03f8476d062 (diff) | |
| download | chromium_src-c11578fbcd901ac9194683118e357726b567b6a6.zip chromium_src-c11578fbcd901ac9194683118e357726b567b6a6.tar.gz chromium_src-c11578fbcd901ac9194683118e357726b567b6a6.tar.bz2 | |
Merge 41419 - Fix mac unit tests
Review URL: http://codereview.chromium.org/884003
TBR=thakis@chromium.org
Review URL: http://codereview.chromium.org/846006
git-svn-id: svn://svn.chromium.org/chrome/branches/342/src@41473 0039d316-1c4b-4281-b951-d872f2087c98
| -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 647cf8e..e5d231a 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| from // 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]; |