webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 15 insertions, 11 deletions

diff --git a/Source/WebKit2/UIProcess/WebContextMenuProxy.h b/Source/WebKit2/UIProcess/WebContextMenuProxy.h
index 098552d3a..f45a50472 100644
--- a/Source/WebKit2/UIProcess/WebContextMenuProxy.h
+++ b/Source/WebKit2/UIProcess/WebContextMenuProxy.h
@@ -26,29 +26,33 @@
 #ifndef WebContextMenuProxy_h
 #define WebContextMenuProxy_h
 
-#include <wtf/PassRefPtr.h>
-#include <wtf/RefCounted.h>
-#include <wtf/Vector.h>
+#if ENABLE(CONTEXT_MENUS)
 
-namespace WebCore {
-    class IntPoint;
-}
+#include "ContextMenuContextData.h"
+#include "UserData.h"
+#include <wtf/RefCounted.h>
 
 namespace WebKit {
 
-class WebContextMenuItemData;
+class WebContextMenuItem;
 
-class WebContextMenuProxy : public RefCounted<WebContextMenuProxy> {
+class WebContextMenuProxy {
 public:
     virtual ~WebContextMenuProxy();
 
-    virtual void showContextMenu(const WebCore::IntPoint&, const Vector<WebContextMenuItemData>& items) = 0;
-    virtual void hideContextMenu() = 0;
+    virtual void show() = 0;
+
+    virtual void showContextMenuWithItems(const Vector<WebContextMenuItemData>& items) = 0;
 
 protected:
-    WebContextMenuProxy();
+    WebContextMenuProxy(const ContextMenuContextData&, const UserData&);
+
+    const ContextMenuContextData m_context;
+    const UserData m_userData;
 };
 
 } // namespace WebKit
 
+#endif
+
 #endif // WebPopupMenuProxy_h