DataList UI (Chromium part)

chrome/renderer/autofill/autofill_agent.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_RENDERER_AUTOFILL_AUTOFILL_AGENT_H_
 #define CHROME_RENDERER_AUTOFILL_AUTOFILL_AGENT_H_
 #pragma once
 
 #include <vector>
 
@@ skipping 58 matching lines @@
   // PageClickListener:
   virtual bool InputElementClicked(const WebKit::WebInputElement& element,
                                    bool was_focused,
                                    bool is_focused) OVERRIDE;
   virtual bool InputElementLostFocus() OVERRIDE;
 
   // WebKit::WebAutofillClient:
   virtual void didAcceptAutofillSuggestion(const WebKit::WebNode& node,
                                            const WebKit::WebString& value,
                                            const WebKit::WebString& label,
-                                           int unique_id,
+                                           int item_id,
                                            unsigned index) OVERRIDE;
   virtual void didSelectAutofillSuggestion(const WebKit::WebNode& node,
                                            const WebKit::WebString& value,
                                            const WebKit::WebString& label,
-                                           int unique_id) OVERRIDE;
+                                           int item_id) OVERRIDE;
   virtual void didClearAutofillSelection(const WebKit::WebNode& node) OVERRIDE;
   virtual void removeAutocompleteSuggestion(
       const WebKit::WebString& name,
       const WebKit::WebString& value) OVERRIDE;
   virtual void textFieldDidEndEditing(
       const WebKit::WebInputElement& element) OVERRIDE;
   virtual void textFieldDidChange(
       const WebKit::WebInputElement& element) OVERRIDE;
   virtual void textFieldDidReceiveKeyDown(
       const WebKit::WebInputElement& element,
@@ skipping 35 matching lines @@
   void ShowSuggestions(const WebKit::WebInputElement& element,
                        bool autofill_on_empty_values,
                        bool requires_caret_at_end,
                        bool display_warning_if_disabled);
 
   // Queries the browser for Autocomplete and Autofill suggestions for the given
   // |element|.
   void QueryAutofillSuggestions(const WebKit::WebInputElement& element,
                                 bool display_warning_if_disabled);
 
+  void CombineDataListEntriesAndShow(const WebKit::WebInputElement& element,
+                         const std::vector<string16>& values,
+                         const std::vector<string16>& labels,
+                         const std::vector<string16>& icons,
+                         const std::vector<int>& unique_ids);

[Ilya Sherman, 2012/04/11 00:18:04]

nit: item_ids?

[keishi, 2012/04/11 11:48:08]

Done.

+
   // Queries the AutofillManager for form data for the form containing |node|.
-  // |value| is the current text in the field, and |unique_id| is the selected
+  // |value| is the current text in the field, and |item_id| is the selected
   // profile's unique ID.  |action| specifies whether to Fill or Preview the
   // values returned from the AutofillManager.
   void FillAutofillFormData(const WebKit::WebNode& node,
-                            int unique_id,
+                            int item_id,

[Ilya Sherman, 2012/04/11 00:18:04]

nit: I would not rename this variable, as this should still be a /unique/ id.

[keishi, 2012/04/11 11:48:08]

Done.

                             AutofillAction action);
 
   // Fills |form| and |field| with the FormData and FormField corresponding to
   // |node|. Returns true if the data was found; and false otherwise.
   bool FindFormAndFieldForNode(
       const WebKit::WebNode& node,
       webkit::forms::FormData* form,
       webkit::forms::FormField* field) WARN_UNUSED_RESULT;
 
   // Set |node| to display the given |value|.
@@ skipping 12 matching lines @@
 
   // The action to take when receiving Autofill data from the AutofillManager.
   AutofillAction autofill_action_;
 
   // Should we display a warning if autofill is disabled?
   bool display_warning_if_disabled_;
 
   // Was the query node autofilled prior to previewing the form?
   bool was_query_node_autofilled_;
 
-  // The menu index of the "Clear" menu item.
-  int suggestions_clear_index_;
-
-  // The menu index of the "Autofill options..." menu item.
-  int suggestions_options_index_;
-
   // 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_;
 
   base::WeakPtrFactory<AutofillAgent> weak_ptr_factory_;
 
   friend class PasswordAutofillManagerTest;
   FRIEND_TEST_ALL_PREFIXES(ChromeRenderViewTest, SendForms);
   FRIEND_TEST_ALL_PREFIXES(ChromeRenderViewTest, FillFormElement);
   FRIEND_TEST_ALL_PREFIXES(PasswordAutofillManagerTest, WaitUsername);
   FRIEND_TEST_ALL_PREFIXES(PasswordAutofillManagerTest, SuggestionAccept);
   FRIEND_TEST_ALL_PREFIXES(PasswordAutofillManagerTest, SuggestionSelect);
 
   DISALLOW_COPY_AND_ASSIGN(AutofillAgent);
 };
 
 }  // namespace autofill
 
 #endif  // CHROME_RENDERER_AUTOFILL_AUTOFILL_AGENT_H_