Index: chrome/browser/ui/cocoa/autofill/autofill_section_container.mm |
diff --git a/chrome/browser/ui/cocoa/autofill/autofill_section_container.mm b/chrome/browser/ui/cocoa/autofill/autofill_section_container.mm |
index 4b7ca826d419877de2a63825a381357f97391b84..57e13461b347759518f8f63d2050fab652a2d394 100644 |
--- a/chrome/browser/ui/cocoa/autofill/autofill_section_container.mm |
+++ b/chrome/browser/ui/cocoa/autofill/autofill_section_container.mm |
@@ -283,20 +283,20 @@ bool CompareInputRows(const autofill::DetailInput* input1, |
- (void)updateSuggestionState { |
const autofill::SuggestionState& suggestionState = |
controller_->SuggestionStateForSection(section_); |
- bool showSuggestions = !suggestionState.text.empty(); |
+ // TODO(estade): use |horizontally_compact_text| when |
+ // |vertically_compact_text| doesn't fit. |
+ const base::string16& text = suggestionState.vertically_compact_text; |
+ bool showSuggestions = suggestionState.visible; |
[[suggestContainer_ view] setHidden:!showSuggestions]; |
[inputs_ setHidden:showSuggestions]; |
- string16 line1; |
- string16 line2; |
- BreakSuggestionText(suggestionState.text, &line1, &line2); |
+ base::string16 line1; |
+ base::string16 line2; |
+ BreakSuggestionText(text, &line1, &line2); |
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); |
- gfx::Font font = rb.GetFont(ui::ResourceBundle::BaseFont).DeriveFont( |
- 0, suggestionState.text_style); |
[suggestContainer_ setSuggestionText:base::SysUTF16ToNSString(line1) |
- line2:base::SysUTF16ToNSString(line2) |
- withFont:font.GetNativeFont()]; |
+ line2:base::SysUTF16ToNSString(line2)]; |
[suggestContainer_ setIcon:suggestionState.icon.AsNSImage()]; |
if (!suggestionState.extra_text.empty()) { |
NSString* extraText = |