Index: chrome/browser/ui/cocoa/autofill/autofill_suggestion_container.mm |
diff --git a/chrome/browser/ui/cocoa/autofill/autofill_suggestion_container.mm b/chrome/browser/ui/cocoa/autofill/autofill_suggestion_container.mm |
index e854cd2d1667e6a4645975d42ff2894b3586e154..56ee21e93f7f58ca024f3c1fee66e7e064296a46 100644 |
--- a/chrome/browser/ui/cocoa/autofill/autofill_suggestion_container.mm |
+++ b/chrome/browser/ui/cocoa/autofill/autofill_suggestion_container.mm |
@@ -125,7 +125,9 @@ const CGFloat kLabelTopPadding = 5.0; |
[self setView:view]; |
} |
-- (void)setSuggestionText:(NSString*)line icon:(NSImage*)icon { |
+- (void)setSuggestionText:(NSString*)line |
+ icon:(NSImage*)icon |
+ wrapText:(BOOL)wrapText { |
[label_ setString:@""]; |
if ([icon size].width) { |
@@ -151,8 +153,12 @@ const CGFloat kLabelTopPadding = 5.0; |
[[label_ textStorage] appendAttributedString:str1]; |
[label_ setVerticallyResizable:YES]; |
- [label_ setHorizontallyResizable:NO]; |
- [label_ setFrameSize:NSMakeSize(2 * autofill::kFieldWidth, kInfiniteSize)]; |
+ [label_ setHorizontallyResizable:!wrapText]; |
+ if (wrapText) |
+ [label_ setFrameSize:NSMakeSize(4 * autofill::kFieldWidth, kInfiniteSize)]; |
+ else |
+ [label_ setFrameSize:NSMakeSize(kInfiniteSize, kInfiniteSize)]; |
+ [[label_ layoutManager] ensureLayoutForTextContainer:[label_ textContainer]]; |
[label_ sizeToFit]; |
} |