Change autofill credit card suggestion text on Android.

components/autofill/core/browser/personal_data_manager.cc

 // Copyright 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.
 
 #include "components/autofill/core/browser/personal_data_manager.h"
 
 #include <algorithm>
 #include <functional>
 #include <iterator>
 
@@ skipping 20 matching lines @@
 #include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_data.h"
 #include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_formatter.h"
 
 namespace autofill {
 namespace {
 
 using ::i18n::addressinput::AddressField;
 using ::i18n::addressinput::GetStreetAddressLinesAsSingleLine;
 using ::i18n::addressinput::STREET_ADDRESS;
 
-const base::string16::value_type kCreditCardPrefix[] = {'*', 0};
-
 template<typename T>
 class FormGroupMatchesByGUIDFunctor {
  public:
   explicit FormGroupMatchesByGUIDFunctor(const std::string& guid)
       : guid_(guid) {
   }
 
   bool operator()(const T& form_group) {
     return form_group.guid() == guid_;
   }
@@ skipping 813 matching lines @@
     if (type.GetStorableType() == CREDIT_CARD_NUMBER) {
       suggestion->value = credit_card->TypeAndLastFourDigits();
       suggestion->label = credit_card->GetInfo(
           AutofillType(CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR), app_locale_);
     } else if (credit_card->number().empty()) {
       if (type.GetStorableType() != CREDIT_CARD_NAME) {
         suggestion->label =
             credit_card->GetInfo(AutofillType(CREDIT_CARD_NAME), app_locale_);
       }
     } else {
-      suggestion->label = kCreditCardPrefix;
+#if defined(OS_ANDROID)
+      // Since Android places the label on its own row, there's more horizontal
+      // space to work with. Show "Amex - 1234" rather than desktop's "*1234".
+      suggestion->label = credit_card->TypeAndLastFourDigits();
+#else
+      suggestion->label = base::ASCIIToUTF16("*");
       suggestion->label.append(credit_card->LastFourDigits());
+#endif
     }
   }
   return suggestions;
 }
 
 bool PersonalDataManager::IsAutofillEnabled() const {
   DCHECK(pref_service_);
   return pref_service_->GetBoolean(prefs::kAutofillEnabled);
 }
 
@@ skipping 374 matching lines @@
   }
   if (IsExperimentalWalletIntegrationEnabled() &&
       pref_service_->GetBoolean(prefs::kAutofillWalletImportEnabled)) {
     profiles_.insert(
         profiles_.end(), server_profiles_.begin(), server_profiles_.end());
   }
   return profiles_;
 }
 
 }  // namespace autofill