Index: chrome/browser/ui/cocoa/browser_window_controller_private.mm |
=================================================================== |
--- chrome/browser/ui/cocoa/browser_window_controller_private.mm (revision 143175) |
+++ chrome/browser/ui/cocoa/browser_window_controller_private.mm (working copy) |
@@ -22,7 +22,6 @@ |
#import "chrome/browser/ui/cocoa/framed_browser_window.h" |
#import "chrome/browser/ui/cocoa/fullscreen_window.h" |
#import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h" |
-#import "chrome/browser/ui/cocoa/nsview_additions.h" |
#import "chrome/browser/ui/cocoa/presentation_mode_controller.h" |
#import "chrome/browser/ui/cocoa/status_bubble_mac.h" |
#import "chrome/browser/ui/cocoa/tab_contents/previewable_contents_controller.h" |
@@ -372,11 +371,10 @@ |
// Actually place the badge *above* |maxY|, by +2 to miss the divider. On |
// Lion or later, shift the badge left to move it away from the fullscreen |
// button. |
- CGFloat badgeXOffset = -(kAvatarRightOffset + possibleExtraShiftForLion); |
- CGFloat badgeYOffset = 2 * [[avatarButton superview] cr_lineWidth]; |
+ CGFloat badgeOffset = kAvatarRightOffset + possibleExtraShiftForLion; |
NSPoint origin = |
- NSMakePoint(width - NSWidth([avatarButton frame]) + badgeXOffset, |
- maxY + badgeYOffset); |
+ NSMakePoint(width - NSWidth([avatarButton frame]) - badgeOffset, |
+ maxY + 2); |
[avatarButton setFrameOrigin:origin]; |
[avatarButton setHidden:NO]; // Make sure it's shown. |
} |
Property changes on: chrome/browser/ui/cocoa/browser_window_controller_private.mm |
___________________________________________________________________ |
Deleted: svn:mergeinfo |