Autofill - change presentation of credit card suggestions.

components/autofill/core/browser/credit_card.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/credit_card.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <ostream>
@@ skipping 18 matching lines @@
 #include "third_party/icu/source/common/unicode/uloc.h"
 #include "third_party/icu/source/i18n/unicode/dtfmtsym.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace autofill {
 
 namespace {
 
 const base::char16 kCreditCardObfuscationSymbol = '*';
 
-// This is the maximum obfuscated symbols displayed.
-// It is introduced to avoid rare cases where the credit card number is
-// too large and fills the screen.
-const size_t kMaxObfuscationSize = 20;
-
 bool ConvertYear(const base::string16& year, int* num) {
   // If the |year| is empty, clear the stored value.
   if (year.empty()) {
     *num = 0;
     return true;
   }
 
   // Try parsing the |year| as a number.
   if (base::StringToInt(year, num))
     return true;
@@ skipping 47 matching lines @@
     if (lowercased_month == base::StringToLowerASCII(icu_month)) {
       *num = i + 1;  // Adjust from 0-indexed to 1-indexed.
       return true;
     }
   }
 
   *num = 0;
   return false;
 }
 
+base::string16 TypeForFill(const std::string& type) {
+  if (type == kAmericanExpressCard)
+    return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_AMEX);
+  if (type == kDinersCard)
+    return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_DINERS);
+  if (type == kDiscoverCard)
+    return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_DISCOVER);
+  if (type == kJCBCard)
+    return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_JCB);
+  if (type == kMasterCard)
+    return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_MASTERCARD);
+  if (type == kUnionPay)
+    return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_UNION_PAY);
+  if (type == kVisaCard)
+    return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_VISA);
+
+  // If you hit this DCHECK, the above list of cases needs to be updated to
+  // include a new card.
+  DCHECK_EQ(kGenericCard, type);
+  return base::string16();
+}
+
 }  // namespace
 
 CreditCard::CreditCard(const std::string& guid, const std::string& origin)
     : AutofillDataModel(guid, origin),
       record_type_(LOCAL_CARD),
       type_(kGenericCard),
       expiration_month_(0),
       expiration_year_(0) {
 }
 
@@ skipping 32 matching lines @@
 
 // static
 const base::string16 CreditCard::StripSeparators(const base::string16& number) {
   base::string16 stripped;
   base::RemoveChars(number, base::ASCIIToUTF16("- "), &stripped);
   return stripped;
 }
 
 // static
 base::string16 CreditCard::TypeForDisplay(const std::string& type) {
-  if (type == kAmericanExpressCard)
-    return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_AMEX);
-  if (type == kDinersCard)
-    return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_DINERS);
-  if (type == kDiscoverCard)
-    return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_DISCOVER);
-  if (type == kJCBCard)
-    return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_JCB);
-  if (type == kMasterCard)
-    return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_MASTERCARD);
-  if (type == kUnionPay)
-    return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_UNION_PAY);
-  if (type == kVisaCard)
-    return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_VISA);
-
-  // If you hit this DCHECK, the above list of cases needs to be updated to
-  // include a new card.
-  DCHECK_EQ(kGenericCard, type);
-  return base::string16();
+  if (kGenericCard == type)
+    return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_GENERIC);
+  return ::autofill::TypeForFill(type);
 }
 
 // This method is not compiled on iOS because the resources are not used and
 // should not be shipped.
 #if !defined(OS_IOS)
 // static
 int CreditCard::IconResourceId(const std::string& type) {
   if (type == kAmericanExpressCard)
     return IDR_AUTOFILL_CC_AMEX;
   if (type == kDinersCard)
@@ skipping 132 matching lines @@
 
     case CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR: {
       base::string16 month = ExpirationMonthAsString();
       base::string16 year = Expiration4DigitYearAsString();
       if (!month.empty() && !year.empty())
         return month + base::ASCIIToUTF16("/") + year;
       return base::string16();
     }
 
     case CREDIT_CARD_TYPE:
-      return TypeForDisplay();
+      return TypeForFill();
 
     case CREDIT_CARD_NUMBER:
       return number_;
 
     case CREDIT_CARD_VERIFICATION_CODE:
       // Chrome doesn't store credit card verification codes.
       return base::string16();
 
     default:
       // ComputeDataPresentForArray will hit this repeatedly.
@@ skipping 88 matching lines @@
       month == expiration_month_) {
     matching_types->insert(CREDIT_CARD_EXP_MONTH);
   }
 }
 
 const base::string16 CreditCard::Label() const {
   base::string16 label;
   if (number().empty())
     return name_on_card_;  // No CC number, return name only.
 
-  base::string16 obfuscated_cc_number = ObfuscatedNumber();
+  base::string16 obfuscated_cc_number = TypeAndLastFourDigits();
   if (!expiration_month_ || !expiration_year_)
     return obfuscated_cc_number;  // No expiration date set.
 
   // TODO(georgey): Internationalize date.
   base::string16 formatted_date(ExpirationMonthAsString());
   formatted_date.append(base::ASCIIToUTF16("/"));
   formatted_date.append(Expiration4DigitYearAsString());
 
   label = l10n_util::GetStringFUTF16(IDS_CREDIT_CARD_NUMBER_PREVIEW_FORMAT,
                                      obfuscated_cc_number,
@@ skipping 14 matching lines @@
   int num = 0;
   bool converted = false;
   converted = base::StringToInt(year_month[0], &num);
   DCHECK(converted);
   SetExpirationYear(num);
   converted = base::StringToInt(year_month[1], &num);
   DCHECK(converted);
   SetExpirationMonth(num);
 }
 
-base::string16 CreditCard::ObfuscatedNumber() const {
-  // If the number is four or less digits, there's no need to obfuscate it.
-  if (number_.size() <= 4)
-    return number_;
-
-  base::string16 number = StripSeparators(number_);
-
-  // Avoid making very long obfuscated numbers.
-  size_t obfuscated_digits = std::min(kMaxObfuscationSize, number.size() - 4);
-  base::string16 result(obfuscated_digits, kCreditCardObfuscationSymbol);
-  return result.append(LastFourDigits());
-}
-
 base::string16 CreditCard::LastFourDigits() const {
   static const size_t kNumLastDigits = 4;
 
   base::string16 number = StripSeparators(number_);
   if (number.size() <= kNumLastDigits)
     return number;
 
   return number.substr(number.size() - kNumLastDigits, kNumLastDigits);
 }
 
 base::string16 CreditCard::TypeForDisplay() const {
   return CreditCard::TypeForDisplay(type_);
 }
 
 base::string16 CreditCard::TypeAndLastFourDigits() const {
   base::string16 type = TypeForDisplay();
-  // TODO(estade): type may be empty, we probably want to return
-  // "Card - 1234" or something in that case.
 
   base::string16 digits = LastFourDigits();
   if (digits.empty())
     return type;
 
   // TODO(estade): i18n.
   return type + base::ASCIIToUTF16(" - ") + digits;
 }
 
 void CreditCard::operator=(const CreditCard& credit_card) {
@@ skipping 105 matching lines @@
 
   base::string16 month = base::IntToString16(expiration_month_);
   if (expiration_month_ >= 10)
     return month;
 
   base::string16 zero = base::ASCIIToUTF16("0");
   zero.append(month);
   return zero;
 }
 
+base::string16 CreditCard::TypeForFill() const {
+  return ::autofill::TypeForFill(type_);
+}
+
 base::string16 CreditCard::Expiration4DigitYearAsString() const {
   if (expiration_year_ == 0)
     return base::string16();
 
   return base::IntToString16(Expiration4DigitYear());
 }
 
 base::string16 CreditCard::Expiration2DigitYearAsString() const {
   if (expiration_year_ == 0)
     return base::string16();
@@ skipping 66 matching lines @@
 const char* const kAmericanExpressCard = "americanExpressCC";
 const char* const kDinersCard = "dinersCC";
 const char* const kDiscoverCard = "discoverCC";
 const char* const kGenericCard = "genericCC";
 const char* const kJCBCard = "jcbCC";
 const char* const kMasterCard = "masterCardCC";
 const char* const kUnionPay = "unionPayCC";
 const char* const kVisaCard = "visaCC";
 
 }  // namespace autofill