Upgrade Seperator in New Autofill UI

chrome/browser/autofill/autofill_popup_view.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_POPUP_VIEW_H_
 #define CHROME_BROWSER_AUTOFILL_AUTOFILL_POPUP_VIEW_H_
 #pragma once
 
 #include <vector>
 
@@ skipping 53 matching lines @@
   const std::vector<string16>& autofill_labels() const {
     return autofill_labels_;
   }
   const std::vector<string16>& autofill_icons() const {
     return autofill_icons_;
   }
   const std::vector<int>& autofill_unique_ids() const {
     return autofill_unique_ids_;
   }
 
+  int row_count() const { return row_count_; }
+
   int selected_line() const { return selected_line_; }
 
   // 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();
 
   // Decrease the selected line by 1, properly handling wrapping.
   void SelectPreviousLine();
 
   // The user has choosen the selected line.
   bool AcceptSelectedLine();
 
   // The user has removed a suggestion.
   bool RemoveSelectedLine();
 
-  // Return true if the index is the first element of a new section and should
-  // have a separator above it.
-  bool IsSeparatorIndex(int index);
-
   // Get the resource value for the given resource, returning -1 if the
   // resource isn't recognized.
   int GetIconResourceID(const string16& resource_name);
 
+  // Get the number of rows this popup will display.
+  int GetRowCount();
+
+  // Convert the given row to its index value. A return value of -1 indicates
+  // the given row was out of bounds.
+  int RowToIndex(size_t row);

[Ilya Sherman, 2012/05/22 20:44:03]

This seems much more complex than just storing the separators as items in the
list we're indexing into.  Did you try that approach and decide against it?

+
  private:
   // Returns true if the given id refers to an element that can be deleted.
   bool CanDelete(int id);
 
   // Returns true if the popup still has non-options entries to show the user.
   bool HasAutofillEntries();
 
   // content::NotificationObserver method override.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // A scoped container for notification registries.
   content::NotificationRegistrar registrar_;
 
   AutofillExternalDelegate* external_delegate_;
 
   // The bounds of the text element that is the focus of the Autofill.
   gfx::Rect element_bounds_;
 
   // The current Autofill query values.
   std::vector<string16> autofill_values_;
   std::vector<string16> autofill_labels_;
   std::vector<string16> autofill_icons_;
   std::vector<int> autofill_unique_ids_;
 
+  // The number of rows that will be displayed in the popup.
+  int row_count_;
+
+  // Mapping to allow conversion between the row and the old index values.
+  std::vector<int> row_to_index_mapping_;
+
   // The line that is currently selected by the user.
   // |kNoSelection| indicates that no line is currently selected.
   int selected_line_;
 };
 
 #endif  // CHROME_BROWSER_AUTOFILL_AUTOFILL_POPUP_VIEW_H_