1 files changed, 97 insertions, 7 deletions

diff --git a/WebKit/chromium/src/AutoFillPopupMenuClient.h b/WebKit/chromium/src/AutoFillPopupMenuClient.h
index 1912fa3..e3edfd3 100644
--- a/WebKit/chromium/src/AutoFillPopupMenuClient.h
+++ b/WebKit/chromium/src/AutoFillPopupMenuClient.h
@@ -31,36 +31,126 @@
 #ifndef AutoFillPopupMenuClient_h
 #define AutoFillPopupMenuClient_h
 
-#include "SuggestionsPopupMenuClient.h"
+#include "PopupMenuClient.h"
 
 namespace WebCore {
 class HTMLInputElement;
+class PopupMenuStyle;
+class RenderStyle;
 }
 
 namespace WebKit {
 class WebString;
+class WebViewImpl;
 template <typename T> class WebVector;
 
 // The AutoFill suggestions popup menu client, used to display name suggestions
 // with right-justified labels.
-class AutoFillPopupMenuClient : public SuggestionsPopupMenuClient {
+class AutoFillPopupMenuClient : public WebCore::PopupMenuClient {
 public:
-    // SuggestionsPopupMenuClient implementation:
+    AutoFillPopupMenuClient();
+    virtual ~AutoFillPopupMenuClient();
+
+    // Returns the number of suggestions available.
     virtual unsigned getSuggestionsCount() const;
+
+    // Returns the suggestion at |listIndex|.
     virtual WebString getSuggestion(unsigned listIndex) const;
+
+    // Returns the label at |listIndex|.
+    virtual WebString getLabel(unsigned listIndex) const;
+
+    // Returns the icon at |listIndex|.
+    virtual WebString getIcon(unsigned listIndex) const;
+
+    // Removes the suggestion at |listIndex| from the list of suggestions.
     virtual void removeSuggestionAtIndex(unsigned listIndex);
 
+    // Returns true if the suggestion at |listIndex| can be removed.
+    bool canRemoveSuggestionAtIndex(unsigned listIndex);
+
+    // WebCore::PopupMenuClient methods:
+    virtual void valueChanged(unsigned listIndex, bool fireEvents = true);
+    virtual void selectionChanged(unsigned, bool);
+    virtual void selectionCleared();
+    virtual WTF::String itemText(unsigned listIndex) const;
+    virtual WTF::String itemLabel(unsigned listIndex) const;
+    virtual WTF::String itemIcon(unsigned listIndex) const;
+    virtual WTF::String itemToolTip(unsigned lastIndex) const { return WTF::String(); }
+    virtual WTF::String itemAccessibilityText(unsigned lastIndex) const { return WTF::String(); }
+    virtual bool itemIsEnabled(unsigned listIndex) const;
+    virtual WebCore::PopupMenuStyle itemStyle(unsigned listIndex) const;
+    virtual WebCore::PopupMenuStyle menuStyle() const;
+    virtual int clientInsetLeft() const { return 0; }
+    virtual int clientInsetRight() const { return 0; }
+    virtual int clientPaddingLeft() const;
+    virtual int clientPaddingRight() const;
+    virtual int listSize() const { return getSuggestionsCount(); }
+    virtual int selectedIndex() const { return m_selectedIndex; }
+    virtual void popupDidHide();
+    virtual bool itemIsSeparator(unsigned listIndex) const;
+    virtual bool itemIsLabel(unsigned listIndex) const { return false; }
+    virtual bool itemIsSelected(unsigned listIndex) const { return false; }
+    virtual bool shouldPopOver() const { return false; }
+    virtual bool valueShouldChangeOnHotTrack() const { return false; }
+    virtual void setTextFromItem(unsigned listIndex);
+    virtual WebCore::FontSelector* fontSelector() const;
+    virtual WebCore::HostWindow* hostWindow() const;
+    virtual PassRefPtr<WebCore::Scrollbar> createScrollbar(
+        WebCore::ScrollbarClient* client,
+        WebCore::ScrollbarOrientation orientation,
+        WebCore::ScrollbarControlSize size);
+
     void initialize(WebCore::HTMLInputElement*,
                     const WebVector<WebString>& names,
                     const WebVector<WebString>& labels,
-                    int defaultSuggestionIndex);
+                    const WebVector<WebString>& icons,
+                    const WebVector<int>& uniqueIDs,
+                    int separatorIndex);
 
     void setSuggestions(const WebVector<WebString>& names,
-                        const WebVector<WebString>& labels);
+                        const WebVector<WebString>& labels,
+                        const WebVector<WebString>& icons,
+                        const WebVector<int>& uniqueIDs,
+                        int separatorIndex);
+
+    // DEPRECATED: Will be removed once Autocomplete and AutoFill merge is
+    // complete.
+    void setAutocompleteMode(bool enabled) { m_AutocompleteModeEnabled = enabled; }
 
 private:
-    Vector<WebCore::String> m_names;
-    Vector<WebCore::String> m_labels;
+    // 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;
+
+    int getSelectedIndex() const { return m_selectedIndex; }
+    void setSelectedIndex(int index) { m_selectedIndex = index; }
+
+    bool itemIsWarning(unsigned listIndex) const;
+
+    // The names, labels and icons that make up the contents of the menu items.
+    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;
+
+    // The index of the selected item.  -1 if there is no selected item.
+    int m_selectedIndex;
+
+    RefPtr<WebCore::HTMLInputElement> m_textField;
+    OwnPtr<WebCore::PopupMenuStyle> m_regularStyle;
+    OwnPtr<WebCore::PopupMenuStyle> m_warningStyle;
+
+    // DEPRECATED: Will be removed once Autocomplete and AutoFill merge is
+    // complete.
+    bool m_AutocompleteModeEnabled;
 };
 
 } // namespace WebKit