Revamp desktop Autofill settings, round 2

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>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/strings/string16.h"
 #include "components/autofill/core/browser/autofill_data_model.h"
 
 namespace autofill {
 
 // A form group that stores credit card information.
 class CreditCard : public AutofillDataModel {
@@ skipping 67 matching lines @@
                         const std::string& app_locale,
                         ServerFieldTypeSet* matching_types) const override;
   base::string16 GetRawInfo(ServerFieldType type) const override;
   void SetRawInfo(ServerFieldType type, const base::string16& value) override;
   base::string16 GetInfo(const AutofillType& type,
                          const std::string& app_locale) const override;
   bool SetInfo(const AutofillType& type,
                const base::string16& value,
                const std::string& app_locale) override;
 
-  // Credit card preview summary, for example: Visa - 1234, Exp: 01/2020
-  // Used for settings and the requestAutocomplete dialog, but not
-  // the autofill dropdown.
+  // Credit card preview summary, for example: "Visa - 1234", ", 01/2020".
+  const std::pair<base::string16, base::string16> LabelPieces() const;
+
+  // 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 user-visible type of the card, e.g. 'Mastercard'.
   base::string16 TypeForDisplay() const;
@@ skipping 116 matching lines @@
 extern const char* const kDiscoverCard;
 extern const char* const kGenericCard;
 extern const char* const kJCBCard;
 extern const char* const kMasterCard;
 extern const char* const kUnionPay;
 extern const char* const kVisaCard;
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_CREDIT_CARD_H_