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

components/autofill/core/browser/credit_card.h

 // 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.
 
 #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_CREDIT_CARD_H_
 #define COMPONENTS_AUTOFILL_CORE_BROWSER_CREDIT_CARD_H_
 
 #include <iosfwd>
 #include <string>
 #include <utility>
@@ skipping 45 matching lines @@
   ~CreditCard() override;
 
   // Returns a version of |number| that has any separator characters removed.
   static const base::string16 StripSeparators(const base::string16& number);
 
   // The user-visible type of the card, e.g. 'Mastercard'.
   static base::string16 TypeForDisplay(const std::string& type);
 
 // This method is not compiled on iOS because the resources are not used and
 // should not be shipped.
+// TODO(rouslan): Use credit card issuer images on iOS. http://crbug.com/535784
 #if !defined(OS_IOS)
   // The ResourceBundle ID for the appropriate credit card image.
   static int IconResourceId(const std::string& type);
 #endif  // #if !defined(OS_IOS)
 
   // Returns the internal representation of credit card type corresponding to
   // the given |number|.  The credit card type is determined purely according to
   // the Issuer Identification Number (IIN), a.k.a. the "Bank Identification
   // Number (BIN)", which is parsed from the relevant prefix of the |number|.
   // This function performs no additional validation checks on the |number|.
@@ skipping 25 matching lines @@
 
   // Like LabelPieces, but appends the two pieces together.
   const base::string16 Label() const;
 
   // Special method to set value for HTML5 month input type.
   void SetInfoForMonthInputType(const base::string16& value);
 
   // The last four digits of the credit card number (or possibly less if there
   // aren't enough characters).
   base::string16 LastFourDigits() const;
+  // The last four digits of the credit card formatted for display as '***2345'.
+  base::string16 LastFourDigitsForDisplay() const;

[Evan Stade, 2016/01/08 03:14:12]

Can you leave these functions alone and just prepend the midline ellipsis to
LastFourDigits in the (2) places you want it?

[please use gerrit instead, 2016/01/12 00:47:26]

Done.

   // The user-visible type of the card, e.g. 'Mastercard'.
   base::string16 TypeForDisplay() const;
-  // A label for this credit card formatted as 'Cardname - 2345'.
-  base::string16 TypeAndLastFourDigits() const;
+  // A label for this credit card formatted as 'IssuerName ***2345'.

[Evan Stade, 2016/01/08 03:14:12]

asterisk is not correct

[please use gerrit instead, 2016/01/12 00:47:26]

Done.

+  base::string16 TypeAndLastFourDigitsForDisplay() const;
+
+  // The expiration for this credit card formatted as 'Exp: 06/17'.
+  base::string16 AbbreviatedExpirationDateForDisplay() const;
 
   const std::string& type() const { return type_; }
 
   int expiration_month() const { return expiration_month_; }
   int expiration_year() const { return expiration_year_; }
 
   // These setters verify that the month and year are within appropriate
   // ranges, or 0. They take integers as an alternative to setting the inputs
   // from strings via SetInfo().
   void SetExpirationMonth(int expiration_month);
@@ skipping 115 matching lines @@
 extern const char kDiscoverCard[];
 extern const char kGenericCard[];
 extern const char kJCBCard[];
 extern const char kMasterCard[];
 extern const char kUnionPay[];
 extern const char kVisaCard[];
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_CREDIT_CARD_H_