1 files changed, 13 insertions, 22 deletions
diff --git a/chromium/third_party/WebKit/Source/web/PopupMenuChromium.h b/chromium/third_party/WebKit/Source/web/PopupMenuChromium.h
index f51ed0be0ca..b6c03329da7 100644
--- a/chromium/third_party/WebKit/Source/web/PopupMenuChromium.h
+++ b/chromium/third_party/WebKit/Source/web/PopupMenuChromium.h
@@ -35,40 +35,31 @@
 #include "wtf/RefPtr.h"
 
 namespace WebCore {
-
-class Frame;
+class LocalFrame;
 class FrameView;
-class IntRect;
-class PopupContainer;
-struct PopupItem;
 class PopupMenuClient;
+}
+
+namespace blink {
+
+class PopupContainer;
 
-class PopupMenuChromium : public PopupMenu {
+class PopupMenuChromium FINAL : public WebCore::PopupMenu {
 public:
-    PopupMenuChromium(Frame&, PopupMenuClient*);
-    ~PopupMenuChromium();
+    PopupMenuChromium(WebCore::LocalFrame&, WebCore::PopupMenuClient*);
+    virtual ~PopupMenuChromium();
 
-    virtual void show(const FloatQuad& controlPosition, const IntSize& controlSize, int index) OVERRIDE;
+    virtual void show(const WebCore::FloatQuad& controlPosition, const WebCore::IntSize& controlSize, int index) OVERRIDE;
     virtual void hide() OVERRIDE;
     virtual void updateFromElement() OVERRIDE;
     virtual void disconnectClient() OVERRIDE;
 
-    static int minimumRowHeight() { return s_minimumRowHeight; }
-    static void setMinimumRowHeight(int minimumRowHeight) { s_minimumRowHeight = minimumRowHeight; }
-    static int optionRowHeightForTouch() { return s_optionRowHeightForTouch; }
-    static void setOptionRowHeightForTouch(int optionRowHeightForTouch) { s_optionRowHeightForTouch = optionRowHeightForTouch; }
-
 private:
-    PopupMenuClient* client() const { return m_popupClient; }
-
-    PopupMenuClient* m_popupClient;
-    RefPtr<FrameView> m_frameView;
+    WebCore::PopupMenuClient* m_popupClient;
+    RefPtr<WebCore::FrameView> m_frameView;
     RefPtr<PopupContainer> m_popup;
-
-    static int s_minimumRowHeight;
-    static int s_optionRowHeightForTouch;
 };
 
-} // namespace WebCore
+} // namespace blink
 
 #endif