Revamp desktop Autofill settings, round 2

components/autofill/core/browser/credit_card.h

Index: components/autofill/core/browser/credit_card.h
diff --git a/components/autofill/core/browser/credit_card.h b/components/autofill/core/browser/credit_card.h
index e3a220425707af7274d8a299dabeb46ed75f7c6d..b25ec8c2d2fa728ba6067b4d72c6555bf4a4ac96 100644
--- a/components/autofill/core/browser/credit_card.h
+++ b/components/autofill/core/browser/credit_card.h
@@ -7,6 +7,7 @@
 
 #include <iosfwd>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "base/compiler_specific.h"
@@ -94,9 +95,10 @@ class CreditCard : public AutofillDataModel {
                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.