Index: Source/WebKit/chromium/src/AutofillPopupMenuClient.h |
diff --git a/Source/WebKit/chromium/src/AutofillPopupMenuClient.h b/Source/WebKit/chromium/src/AutofillPopupMenuClient.h |
index 73cc180e00b4ceb5081595b46230a2fc7a3b89ac..f5656ec6e5b931f134f8b09e623410ae30f1e7e5 100644 |
--- a/Source/WebKit/chromium/src/AutofillPopupMenuClient.h |
+++ b/Source/WebKit/chromium/src/AutofillPopupMenuClient.h |
@@ -106,20 +106,14 @@ public: |
const WebVector<WebString>& names, |
const WebVector<WebString>& labels, |
const WebVector<WebString>& icons, |
- const WebVector<int>& uniqueIDs, |
- int separatorIndex); |
+ const WebVector<int>& itemIDs); |
void setSuggestions(const WebVector<WebString>& names, |
const WebVector<WebString>& labels, |
const WebVector<WebString>& icons, |
- const WebVector<int>& uniqueIDs, |
- int separatorIndex); |
+ const WebVector<int>& itemIDs); |
private: |
- // Convert the specified index from an index into the visible list (which might |
- // include a separator entry) to an index to |m_names| and |m_labels|. |
- // Returns -1 if the given index points to the separator. |
- int convertListIndexToInternalIndex(unsigned) const; |
WebViewImpl* getWebView() const; |
WebCore::HTMLInputElement* getTextField() const { return m_textField.get(); } |
WebCore::RenderStyle* textFieldStyle() const; |
@@ -133,10 +127,7 @@ private: |
Vector<WTF::String> m_names; |
Vector<WTF::String> m_labels; |
Vector<WTF::String> m_icons; |
- Vector<int> m_uniqueIDs; |
- |
- // The index of the separator. -1 if there is no separator. |
- int m_separatorIndex; |
+ Vector<int> m_itemIDs; |
// The index of the selected item. -1 if there is no selected item. |
int m_selectedIndex; |