Add card details and legal message to Android save credit card infobar.

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 <stdint.h>
 
 #include <algorithm>
@@ skipping 468 matching lines @@
 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::LastFourDigitsForDisplay() const {
+  base::string16 digits = LastFourDigits();
+  // Prepend the midline horizontal ellipsis (U+22EF).
+  // TODO(estade): i18n?
+  return digits.empty() ? base::string16()
+                        : base::UTF8ToUTF16("\xE2\x8B\xAF") + digits;
+}
+
 base::string16 CreditCard::TypeForDisplay() const {
   return CreditCard::TypeForDisplay(type_);
 }
 
 base::string16 CreditCard::TypeAndLastFourDigits() const {

[Justin Donnelly, 2015/12/30 18:06:37]

Change to TypeAndLastFourDigitsForDisplay for consistency.

[please use gerrit instead, 2016/01/07 01:39:25]

Done.

   base::string16 type = TypeForDisplay();
 
-  base::string16 digits = LastFourDigits();
+  base::string16 digits = LastFourDigitsForDisplay();
   if (digits.empty())
     return type;
 
-  // The separator character is a non breaking space and a horizontal midline
-  // ellipsis.
-  // TODO(estade): i18n?
-  return type + base::UTF8ToUTF16("\xC2\xA0\xE2\x8B\xAF") + digits;
+  // The separator character is a non breaking space.
+  return type + base::UTF8ToUTF16("\xC2\xA0") + digits;
+}
+
+base::string16 CreditCard::AbbreviatedExpirationDateForDisplay() const {
+  base::string16 month = ExpirationMonthAsString();
+  base::string16 year = Expiration2DigitYearAsString();
+  return month.empty() || year.empty()
+             ? base::string16()
+             : l10n_util::GetStringFUTF16(
+                   IDS_AUTOFILL_CREDIT_CARD_EXPIRATION_DATE_ABBR, month, year);
 }
 
 void CreditCard::operator=(const CreditCard& credit_card) {
   set_use_count(credit_card.use_count());
   set_use_date(credit_card.use_date());
   set_modification_date(credit_card.modification_date());
 
   if (this == &credit_card)
     return;
 
@@ skipping 276 matching lines @@
 const char kAmericanExpressCard[] = "americanExpressCC";
 const char kDinersCard[] = "dinersCC";
 const char kDiscoverCard[] = "discoverCC";
 const char kGenericCard[] = "genericCC";
 const char kJCBCard[] = "jcbCC";
 const char kMasterCard[] = "masterCardCC";
 const char kUnionPay[] = "unionPayCC";
 const char kVisaCard[] = "visaCC";
 
 }  // namespace autofill