Add Datalist Support to New Autofill UI

chrome/browser/autofill/autofill_external_delegate.h

 // Copyright (c) 2012 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 CHROME_BROWSER_AUTOFILL_AUTOFILL_EXTERNAL_DELEGATE_H_
 #define CHROME_BROWSER_AUTOFILL_AUTOFILL_EXTERNAL_DELEGATE_H_
 #pragma once
 
 #include <vector>
 
@@ skipping 45 matching lines @@
       const std::vector<string16>& autofill_values,
       const std::vector<string16>& autofill_labels,
       const std::vector<string16>& autofill_icons,
       const std::vector<int>& autofill_unique_ids);
 
   // Show password suggestions in the popup.
   void OnShowPasswordSuggestions(const std::vector<string16>& suggestions,
                                  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);
 
   // Remove the given Autofill profile or credit credit.
   virtual void RemoveAutofillProfileOrCreditCard(int unique_id);
 
   // Inform the delegate that the text field editing has ended, this is
   // used to help record the metrics of when a new popup is shown.
   void DidEndTextFieldEditing();
 
@@ skipping 52 matching lines @@
   // Return the profile that this autofill delegate is currently working with.
   Profile* profile() { return tab_contents_wrapper_->profile(); }
 
  private:
   // Fills the form with the Autofill data corresponding to |unique_id|.
   // If |is_preview| is true then this is just a preview to show the user what
   // would be selected and if |is_preview| is false then the user has selected
   // 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.
 
   // Password Autofill manager, handles all password-related Autofilling.
   PasswordAutofillManager password_autofill_manager_;
 
   // The ID of the last request sent for form field Autofill.  Used to ignore
   // out of date responses.
   int autofill_query_id_;
 
   // The current form and field selected by Autofill.
   webkit::forms::FormData autofill_query_form_;
   webkit::forms::FormField autofill_query_field_;
 
   // Should we display a warning if Autofill is disabled?
   bool display_warning_if_disabled_;
 
   // Have we already shown Autofill suggestions for the field the user is
   // 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);
 };
 
 #endif  // CHROME_BROWSER_AUTOFILL_AUTOFILL_EXTERNAL_DELEGATE_H_