Add Datalist Support to New Autofill UI

chrome/browser/autofill/autofill_external_delegate.h

Index: chrome/browser/autofill/autofill_external_delegate.h
diff --git a/chrome/browser/autofill/autofill_external_delegate.h b/chrome/browser/autofill/autofill_external_delegate.h
index 652f9ee432a44d4434b5d1c7fc9917847f456796..613833a5ea5b760ad3222691024f346414508704 100644
--- a/chrome/browser/autofill/autofill_external_delegate.h
+++ b/chrome/browser/autofill/autofill_external_delegate.h
@@ -63,6 +63,12 @@ class AutofillExternalDelegate {
                                  const webkit::forms::FormField& field,
                                  const gfx::Rect& bounds);
 
+  // Set the data list value associated with the current field.
+  void SetCurrentDataListValues(const std::vector<string16>& values,
+                                const std::vector<string16>& labels,
+                                const std::vector<string16>& icons,
+                                const std::vector<int>& unique_ids);
+
   // Remove the given Autocomplete entry from the DB.
   virtual void RemoveAutocompleteEntry(const string16& value);
 
@@ -135,6 +141,25 @@ class AutofillExternalDelegate {
   // this data.
   void FillAutofillFormData(int unique_id, bool is_preview);
 
+  // Handle applying any Autofill warnings to the Autofill popup.
+  void ApplyAutofillWarnings(std::vector<string16>* autofill_values,
+                             std::vector<string16>* autofill_labels,
+                             std::vector<string16>* autofill_icons,
+                             std::vector<int>* autofill_unique_ids);
+
+  // Handle applying any Autofill option listings to the Autofill popup.

[Ilya Sherman, 2012/06/04 22:05:01]

nit: This comment should mention that the method should only be called in the
case that there is at least one multi-field suggestion in the list of
suggestions.

[csharp, 2012/06/06 14:06:52]

Done.

+  void ApplyAutofillOptions(std::vector<string16>* autofill_values,
+                            std::vector<string16>* autofill_labels,
+                            std::vector<string16>* autofill_icons,
+                            std::vector<int>* autofill_unique_ids);
+
+  // Insert the data list values at the start of the given list, including
+  // any required separators.
+  void InsertDataListValues(std::vector<string16>* autofill_values,
+                            std::vector<string16>* autofill_labels,
+                            std::vector<string16>* autofill_icons,
+                            std::vector<int>* autofill_unique_ids);

[Ilya Sherman, 2012/06/04 22:05:01]

Do these methods all need access to the instantiated object's state?  If not,
please tuck them into the anonymous namespace in the implementation file.

[csharp, 2012/06/06 14:06:52]

They both need access to a few booleans in the class, it seems cleaner to me to
keep them as member function, I have no problem adding the variables to the
arguments and putting them in the anonymous namespace if you feel that it would
be cleaner.

[Ilya Sherman, 2012/06/06 22:25:45]

Ok, sounds good.  Since they access member booleans, leaving them as private
methods is fine.

+
   TabContentsWrapper* tab_contents_wrapper_;  // weak; owns me.
   AutofillManager* autofill_manager_;  // weak.
 
@@ -156,6 +181,15 @@ class AutofillExternalDelegate {
   // currently editing?  Used to keep track of state for metrics logging.
   bool has_shown_autofill_popup_for_current_edit_;
 
+  // Used to indicate if a popup is currently being shown or not.
+  bool popup_visible_;
+
+  // The current data list values.
+  std::vector<string16> data_list_values_;
+  std::vector<string16> data_list_labels_;
+  std::vector<string16> data_list_icons_;
+  std::vector<int> data_list_unique_ids_;
+
   DISALLOW_COPY_AND_ASSIGN(AutofillExternalDelegate);
 };