[rAc] [OSX] Use vertically compact text to show suggestions, when it fits.

chrome/browser/ui/cocoa/autofill/autofill_suggestion_container.mm

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/autofill/autofill_suggestion_container.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/logging.h"
@@ skipping 107 matching lines @@
   spacer_.reset([[NSBox alloc] initWithFrame:NSZeroRect]);
   [spacer_ setBoxType:NSBoxSeparator];
   [spacer_ setBorderType:NSLineBorder];
 
   base::scoped_nsobject<NSView> view([[NSView alloc] initWithFrame:NSZeroRect]);
   [view setSubviews:
       @[ label_, inputField_, spacer_ ]];
   [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) {
     base::scoped_nsobject<IconAttachmentCell> cell(
         [[IconAttachmentCell alloc] initImageCell:icon]);
     base::scoped_nsobject<NSTextAttachment> attachment(
         [[NSTextAttachment alloc] init]);
     [cell adjustBaselineForFont:[NSFont controlContentFontOfSize:0]];
     [cell setAlignment:NSLeftTextAlignment];
     [attachment setAttachmentCell:cell];
     [[label_ textStorage] setAttributedString:
         [NSAttributedString attributedStringWithAttachment:attachment]];
   }
 
   NSDictionary* attributes = @{
     NSParagraphStyleAttributeName : [label_ defaultParagraphStyle],
             NSCursorAttributeName : [NSCursor arrowCursor],
               NSFontAttributeName : [NSFont controlContentFontOfSize:0]
   };
   base::scoped_nsobject<NSAttributedString> str1(
       [[NSAttributedString alloc] initWithString:line
                                       attributes:attributes]);
   [[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];
 }
 
 - (void)showInputField:(NSString*)text withIcon:(NSImage*)icon {
   [[inputField_ cell] setPlaceholderString:text];
   [[inputField_ cell] setIcon:icon];
   [inputField_ setHidden:NO];
   [inputField_ sizeToFit];
 
   // Enforce fixed width.
@@ skipping 43 matching lines @@
     // Due to fixed width, fields are guaranteed to not overlap.
     DCHECK_LE(NSMaxX(labelFrame), NSMinX(inputfieldFrame));
   }
 
   [spacer_ setFrame:spacerFrame];
   [label_ setFrame:labelFrame];
   [[self view] setFrameSize:preferredContainerSize];
 }
 
 @end