[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];
   }
+
+  // Prefer the vertically compact text when it fits. If it doesn't fit, fall
+  // back to the horizontally compact text.
+  NSString* vertically_compact_text =
+      base::SysUTF16ToNSString(suggestionState.vertically_compact_text);
+  [suggestContainer_ setSuggestionText:vertically_compact_text
+                                  icon:suggestionState.icon.AsNSImage()
+                              wrapText:NO];
+  if ([suggestContainer_ preferredSize].width > kDetailsWidth) {

[groby-ooo-7-16, 2013/12/14 04:39:19]

Shouldn't that logic just happen in the suggestContainer_?  It's odd to set the
string, ask for the preferredSize, and then change our mind...

Ideally, we wouldn't even need two strings. Just remove the line breaks, try if
that fits on a single line. If it doesn't, take the original text. 

[Ilya Sherman, 2013/12/14 05:02:27]

Done.

+    NSString* horizontally_compact_text =
+        base::SysUTF16ToNSString(suggestionState.horizontally_compact_text);
+    [suggestContainer_ setSuggestionText:horizontally_compact_text
+                                    icon:suggestionState.icon.AsNSImage()
+                                wrapText:YES];
+  }
+
   [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