Index: chrome/browser/ui/android/autofill/autofill_keyboard_accessory_view.cc |
diff --git a/chrome/browser/ui/android/autofill/autofill_keyboard_accessory_view.cc b/chrome/browser/ui/android/autofill/autofill_keyboard_accessory_view.cc |
index 25c5f5b31ffd8e4fd41bf2a95aed6c5cbf294369..33ef3fb492c86dfbca365a7f55be7a9722dad9ec 100644 |
--- a/chrome/browser/ui/android/autofill/autofill_keyboard_accessory_view.cc |
+++ b/chrome/browser/ui/android/autofill/autofill_keyboard_accessory_view.cc |
@@ -60,13 +60,6 @@ void AutofillKeyboardAccessoryView::UpdateBoundsAndRedrawPopup() { |
for (size_t i = 0; i < count; ++i) { |
const autofill::Suggestion& suggestion = controller_->GetSuggestionAt(i); |
- base::string16 value = suggestion.value; |
- if (!suggestion.label.empty()) { |
- value.append( |
- l10n_util::GetStringUTF16(IDS_AUTOFILL_ADDRESS_SUMMARY_SEPARATOR)); |
- value.append(suggestion.label); |
- } |
- |
int android_icon_id = 0; |
if (!suggestion.icon.empty()) { |
android_icon_id = ResourceMapper::MapFromChromiumId( |
@@ -75,7 +68,8 @@ void AutofillKeyboardAccessoryView::UpdateBoundsAndRedrawPopup() { |
Java_AutofillKeyboardAccessoryBridge_addToAutofillSuggestionArray( |
env, data_array.obj(), i, |
- base::android::ConvertUTF16ToJavaString(env, value).obj(), |
+ base::android::ConvertUTF16ToJavaString(env, suggestion.value).obj(), |
+ base::android::ConvertUTF16ToJavaString(env, suggestion.label).obj(), |
android_icon_id, suggestion.frontend_id); |
} |