Expanded Autofill Credit Card Popup Layout Experiment in Android.

components/autofill/core/browser/autofill_external_delegate.h

Index: components/autofill/core/browser/autofill_external_delegate.h
diff --git a/components/autofill/core/browser/autofill_external_delegate.h b/components/autofill/core/browser/autofill_external_delegate.h
index 5431b31fe6c664b874dd3cfe27922bb479164275..c35dc31b2197128c4a53fb63f250df681de0cc42 100644
--- a/components/autofill/core/browser/autofill_external_delegate.h
+++ b/components/autofill/core/browser/autofill_external_delegate.h
@@ -51,6 +51,9 @@ class AutofillExternalDelegate : public AutofillPopupDelegate {
                                    base::string16* body) override;
   bool RemoveSuggestion(const base::string16& value, int identifier) override;
   void ClearPreviewedForm() override;
+  // Returns false for all fields prior to |onQuery|, true for credit card
+  // fields after call to |onQuery|.
+  bool IsCreditCardField() override;
 
   // Records and associates a query_id with web form data.  Called
   // when the renderer posts an Autofill query to the browser. |bounds|
@@ -118,6 +121,9 @@ class AutofillExternalDelegate : public AutofillPopupDelegate {
   // version.
   void InsertDataListValues(std::vector<Suggestion>* suggestions);
 
+  // Returns the text (i.e. |Suggestion| value) for Chrome autofill options.
+  base::string16 GetSettingsSuggestionValue() const;
+
   AutofillManager* manager_;  // weak.
 
   // Provides driver-level context to the shared code of the component. Must
@@ -144,6 +150,7 @@ class AutofillExternalDelegate : public AutofillPopupDelegate {
 
   // FIXME

[Mathieu, 2016/12/01 21:59:47]

unclear why this is here?

[csashi, 2016/12/02 05:15:29]

By "this", do you mean the "FIXME" or the "is_credit_card_field_"? The
"is_credit_card_field" is here so we can show the current settings text in
ApplyAutofillOptions. By default we will show "Chrome Autofill Settings". In an
experiment, we can try replacing with "Add or Remove Cards.

I have removed the FIXME.

   bool should_show_scan_credit_card_;
+  bool is_credit_card_field_;
 
   // Whether the credit card signin promo should be shown to the user.
   bool should_show_cc_signin_promo_;