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 361 matching lines @@
   }
 }
 
 base::string16 CreditCard::GetInfo(const AutofillType& type,
                                    const std::string& app_locale) const {
   ServerFieldType storable_type = type.GetStorableType();
   if (storable_type == CREDIT_CARD_NUMBER) {
     // Web pages should never actually be filled by a masked server card,
     // but this function is used at the preview stage.
     if (record_type() == MASKED_SERVER_CARD)
-      return TypeAndLastFourDigits();
+      return TypeAndLastFourDigitsForDisplay();
 
     return StripSeparators(number_);
   }
 
   return GetRawInfo(storable_type);
 }
 
 bool CreditCard::SetInfo(const AutofillType& type,
                          const base::string16& value,
                          const std::string& app_locale) {
@@ skipping 30 matching lines @@
   return pieces.first + pieces.second;
 }
 
 const std::pair<base::string16, base::string16> CreditCard::LabelPieces()
     const {
   base::string16 label;
   // No CC number, return name only.
   if (number().empty())
     return std::make_pair(name_on_card_, base::string16());
 
-  base::string16 obfuscated_cc_number = TypeAndLastFourDigits();
+  base::string16 obfuscated_cc_number = TypeAndLastFourDigitsForDisplay();
   // No expiration date set.
   if (!expiration_month_ || !expiration_year_)
     return std::make_pair(obfuscated_cc_number, base::string16());
 
   base::string16 formatted_date(ExpirationMonthAsString());
   formatted_date.append(base::ASCIIToUTF16("/"));
   formatted_date.append(Expiration4DigitYearAsString());
 
   base::string16 separator =
       l10n_util::GetStringUTF16(IDS_AUTOFILL_ADDRESS_SUMMARY_SEPARATOR);
@@ skipping 35 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 {
+base::string16 CreditCard::TypeAndLastFourDigitsForDisplay() const {
   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 87 matching lines @@
     return false;
   }
 
   if (number_.empty())
     return true;
 
   if (other.record_type() == FULL_SERVER_CARD)
     return StripSeparators(number_) == StripSeparators(other.number_);
 
   // For masked cards, this is the best we can do to compare card numbers.
-  return TypeAndLastFourDigits() == other.TypeAndLastFourDigits();
+  return TypeAndLastFourDigitsForDisplay() ==
+         other.TypeAndLastFourDigitsForDisplay();
 }
 
 bool CreditCard::operator==(const CreditCard& credit_card) const {
   return guid() == credit_card.guid() &&
          origin() == credit_card.origin() &&
          Compare(credit_card) == 0;
 }
 
 bool CreditCard::operator!=(const CreditCard& credit_card) const {
   return !operator==(credit_card);
@@ skipping 168 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