Create an autofill Suggestion class

chrome/browser/ui/autofill/autofill_popup_controller_impl.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_UI_AUTOFILL_AUTOFILL_POPUP_CONTROLLER_IMPL_H_
 #define CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_POPUP_CONTROLLER_IMPL_H_
 
 #include "base/gtest_prod_util.h"
 #include "base/i18n/rtl.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 20 matching lines @@
   // |web_contents| while the popup is showing, unless |web_contents| is NULL.
   static base::WeakPtr<AutofillPopupControllerImpl> GetOrCreate(
       base::WeakPtr<AutofillPopupControllerImpl> previous,
       base::WeakPtr<AutofillPopupDelegate> delegate,
       content::WebContents* web_contents,
       gfx::NativeView container_view,
       const gfx::RectF& element_bounds,
       base::i18n::TextDirection text_direction);
 
   // Shows the popup, or updates the existing popup with the given values.
-  void Show(const std::vector<base::string16>& names,
-            const std::vector<base::string16>& subtexts,
-            const std::vector<base::string16>& icons,
-            const std::vector<int>& identifiers);
+  void Show(const std::vector<autofill::Suggestion>& suggestions);
 
   // Updates the data list values currently shown with the popup.
   void UpdateDataListValues(const std::vector<base::string16>& values,
                             const std::vector<base::string16>& labels);
 
   // Hides the popup and destroys the controller. This also invalidates
   // |delegate_|.
   void Hide() override;
 
   // Invoked when the view was destroyed by by someone other than this class.
@@ skipping 26 matching lines @@
   int GetIconResourceID(const base::string16& resource_name) const override;
   bool CanDelete(size_t index) const override;
   bool IsWarning(size_t index) const override;
   gfx::Rect GetRowBounds(size_t index) override;
   void SetPopupBounds(const gfx::Rect& bounds) override;
   const gfx::Rect& popup_bounds() const override;
   gfx::NativeView container_view() override;
   const gfx::RectF& element_bounds() const override;
   bool IsRTL() const override;
 
-  const std::vector<base::string16>& names() const override;
-  const std::vector<base::string16>& subtexts() const override;
-  const std::vector<base::string16>& icons() const override;
-  const std::vector<int>& identifiers() const override;
+  virtual size_t GetLineCount() const override;
+  virtual const autofill::Suggestion& GetSuggestionAt(
+      size_t row) const override;
+  virtual const base::string16& GetElidedValueAt(size_t row) const override;
+  virtual const base::string16& GetElidedLabelAt(size_t row) const override;
 #if !defined(OS_ANDROID)
-  const gfx::FontList& GetNameFontListForRow(size_t index) const override;
-  const gfx::FontList& subtext_font_list() const override;
+  const gfx::FontList& GetValueFontListForRow(size_t index) const override;
+  const gfx::FontList& GetLabelFontList() const override;
 #endif
   int selected_line() const override;
 
   content::WebContents* web_contents();
 
   // Change which line is currently selected by the user.
   void SetSelectedLine(int selected_line);
 
   // Increase the selected line by 1, properly handling wrapping.
   void SelectNextLine();
@@ skipping 11 matching lines @@
   int GetRowHeightFromId(int identifier) const;
 
   // Returns true if the given id refers to an element that can be accepted.
   bool CanAccept(int id);
 
   // Returns true if the popup still has non-options entries to show the user.
   bool HasSuggestions();
 
   // Set the Autofill entry values. Exposed to allow tests to set these values
   // without showing the popup.
-  void SetValues(const std::vector<base::string16>& names,
-                 const std::vector<base::string16>& subtexts,
-                 const std::vector<base::string16>& icons,
-                 const std::vector<int>& identifier);
+  void SetValues(const std::vector<autofill::Suggestion>& suggestions);
 
   AutofillPopupView* view() { return view_; }
 
   // |view_| pass throughs (virtual for testing).
   virtual void ShowView();
   virtual void InvalidateRow(size_t row);
 
   // Protected so tests can access.
 #if !defined(OS_ANDROID)
   // Calculates the desired width of the popup based on its contents.
@@ skipping 28 matching lines @@
   AutofillPopupView* view_;  // Weak reference.
   base::WeakPtr<AutofillPopupDelegate> delegate_;
 
   // The bounds of the Autofill popup.
   gfx::Rect popup_bounds_;
 
   // The text direction of the popup.
   base::i18n::TextDirection text_direction_;
 
   // The current Autofill query values.
-  std::vector<base::string16> names_;
-  std::vector<base::string16> subtexts_;
-  std::vector<base::string16> icons_;
-  std::vector<int> identifiers_;
+  std::vector<autofill::Suggestion> suggestions_;
 
-  // Since names_ can be elided to ensure that it fits on the screen, we need to
-  // keep an unelided copy of the names to be able to pass to the delegate.
-  std::vector<base::string16> full_names_;
+  // Elided values and labels corresponding to the suggestions_ vector to
+  // ensure that it fits on the screen.
+  std::vector<base::string16> elided_values_;
+  std::vector<base::string16> elided_labels_;
 
 #if !defined(OS_ANDROID)
   // The fonts for the popup text.
-  gfx::FontList name_font_list_;
-  gfx::FontList subtext_font_list_;
+  gfx::FontList value_font_list_;
+  gfx::FontList label_font_list_;
   gfx::FontList warning_font_list_;
   gfx::FontList title_font_list_;
 #endif
 
   // The line that is currently selected by the user.
   // |kNoSelection| indicates that no line is currently selected.
   int selected_line_;
 
   base::WeakPtrFactory<AutofillPopupControllerImpl> weak_ptr_factory_;
 };
 
 }  // namespace autofill
 
 #endif  // CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_POPUP_CONTROLLER_IMPL_H_