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

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

 // Copyright (c) 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_section_container.h"
 
 #include <algorithm>
 
 #include "base/mac/foundation_util.h"
 #include "base/strings/sys_string_conversions.h"
@@ skipping 278 matching lines @@
 - (void)didEndEditing:(id)sender {
   delegate_->FocusMoved();
   [validationDelegate_ hideErrorBubble];
   [self validateFor:autofill::VALIDATE_EDIT];
   [self updateEditability];
 }
 
 - (void)updateSuggestionState {
   const autofill::SuggestionState& suggestionState =
       delegate_->SuggestionStateForSection(section_);
-  // TODO(estade): use |vertically_compact_text| when it fits.
-  const base::string16& text = suggestionState.horizontally_compact_text;
   showSuggestions_ = suggestionState.visible;
 
-  [suggestContainer_ setSuggestionText:base::SysUTF16ToNSString(text)
-                                  icon:suggestionState.icon.AsNSImage()];
-
   if (!suggestionState.extra_text.empty()) {
     NSString* extraText =
         base::SysUTF16ToNSString(suggestionState.extra_text);
     NSImage* extraIcon = suggestionState.extra_icon.AsNSImage();
     [suggestContainer_ showInputField:extraText withIcon:extraIcon];
   }
+
+  // NOTE: It's important to set the input field, if there is one, _before_
+  // setting the suggestion text, since the suggestion container needs to
+  // account for the input field's width when deciding which of the two string
+  // representations to use.
+  NSString* verticallyCompactText =
+      base::SysUTF16ToNSString(suggestionState.vertically_compact_text);
+  NSString* horizontallyCompactText =
+      base::SysUTF16ToNSString(suggestionState.horizontally_compact_text);
+  [suggestContainer_
+      setSuggestionWithVerticallyCompactText:verticallyCompactText
+                     horizontallyCompactText:horizontallyCompactText
+                                        icon:suggestionState.icon.AsNSImage()
+                                    maxWidth:kDetailsWidth];
+
   [view_ setShouldHighlightOnHover:showSuggestions_];
   if (showSuggestions_)
     [view_ setClickTarget:suggestButton_];
   else
     [view_ setClickTarget:nil];
   [view_ setHidden:!delegate_->SectionIsActive(section_)];
 }
 
 - (void)update {
   [self updateAndClobber:YES];
@@ skipping 353 matching lines @@
 - (void)activateFieldForInput:(const autofill::DetailInput&)input {
   if ([self detailInputForType:input.type] != &input)
     return;
 
   NSControl<AutofillInputField>* field = [inputs_ viewWithTag:input.type];
   [[field window] makeFirstResponder:field];
   [self textfieldEditedOrActivated:field edited:NO];
 }
 
 @end