Index: chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm |
diff --git a/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm b/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm |
index 2c8a22324cf495473a723774790156fe4271c5b1..415e592401dc36cf29002c7fb0fd95c2c29e72a8 100644 |
--- a/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm |
+++ b/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm |
@@ -701,6 +701,13 @@ class ActiveProfileObserverBridge : public AvatarMenuObserver, |
IDS_PROFILES_NEW_AVATAR_MENU_EDIT_NAME_ACCESSIBLE_NAME, |
base::SysNSStringToUTF16(profileName)) |
forAttribute:NSAccessibilityTitleAttribute]; |
+ |
+ NSSize textSize = [profileName sizeWithAttributes: |
+ @{NSFontAttributeName: [profileNameTextField_ font]}]; |
+ |
+ if (textSize.width > frameRect.size.width - [hoverImage size].width * 2) { |
noms (inactive)
2015/02/23 22:16:34
nit: no {}, only 2 spaces indent on the second lin
wesleylancel
2015/02/23 22:45:47
Done.
|
+ [self setToolTip:profileName]; |
+ } |
} |
[[self cell] accessibilitySetOverrideValue:NSAccessibilityButtonRole |
@@ -1805,6 +1812,15 @@ class ActiveProfileObserverBridge : public AvatarMenuObserver, |
[profileButton setTarget:self]; |
[profileButton setAction:@selector(switchToProfile:)]; |
+ NSSize textSize = [[profileButton title] sizeWithAttributes: |
+ @{NSFontAttributeName: [profileButton font]}]; |
+ |
+ if (lroundf(textSize.width) > |
+ rect.size.width - kSmallImageSide - |
noms (inactive)
2015/02/23 22:16:34
nit: move the thing on the right hand side of the
wesleylancel
2015/02/23 22:45:47
Done.
|
+ kImageTitleSpacing - kHorizontalSpacing) { |
+ [profileButton setToolTip:[profileButton title]]; |
noms (inactive)
2015/02/23 22:16:34
nit: only indent 2 spaces
wesleylancel
2015/02/23 22:45:48
Done.
|
+ } |
+ |
return profileButton.autorelease(); |
} |