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 8557450ef6c25d0426130f226a837cc2f07d28c8..f840d9b6d9fdf724bf298f658b1fc2d3196a0301 100644 |
--- a/chrome/browser/ui/cocoa/autofill/autofill_section_container.mm |
+++ b/chrome/browser/ui/cocoa/autofill/autofill_section_container.mm |
@@ -621,7 +621,7 @@ bool ShouldOverwriteComboboxes(autofill::DialogSection section, |
base::scoped_nsobject<AutofillTextField> field( |
[[AutofillTextField alloc] init]); |
[[field cell] setPlaceholderString: |
- l10n_util::GetNSStringWithFixup(input.placeholder_text_rid)]; |
+ base::SysUTF16ToNSString(input.placeholder_text)]; |
groby-ooo-7-16
2014/01/04 01:15:33
Unless you are 100% certain there will never be el
Dan Beam
2014/01/04 01:39:23
meh, guess it doesn't hurt. Done.
|
NSString* tooltipText = |
base::SysUTF16ToNSString(delegate_->TooltipForField(input.type)); |
if ([tooltipText length] > 0) { |
@@ -652,8 +652,10 @@ bool ShouldOverwriteComboboxes(autofill::DialogSection section, |
} |
layout->AddView(control); |
- if (input.length == autofill::DetailInput::LONG) |
+ if (input.length == autofill::DetailInput::LONG || |
+ input.length == autofill::DetailInput::SHORT_EOL) { |
++column_set_id; |
+ } |
} |
[self updateFieldIcons]; |