Index: webkit/port/platform/chromium/ContextMenuChromium.cpp |
=================================================================== |
--- webkit/port/platform/chromium/ContextMenuChromium.cpp (revision 0) |
+++ webkit/port/platform/chromium/ContextMenuChromium.cpp (working copy) |
@@ -26,12 +26,6 @@ |
#include "config.h" |
#include "ContextMenu.h" |
-#include "CString.h" |
-#include "Document.h" |
-#include "Frame.h" |
-#include "FrameView.h" |
-#include "Node.h" |
- |
namespace WebCore { |
// This is a stub implementation of WebKit's ContextMenu class that does |
@@ -66,11 +60,6 @@ |
{ |
} |
-static ContextMenuItem* contextMenuItemByIdOrPosition(HMENU menu, unsigned id, BOOL byPosition) |
-{ |
- return 0; |
-} |
- |
ContextMenuItem* ContextMenu::itemWithAction(unsigned action) |
{ |
return 0; |
@@ -81,16 +70,16 @@ |
return 0; |
} |
-void ContextMenu::setPlatformDescription(HMENU menu) |
+void ContextMenu::setPlatformDescription(PlatformMenuDescription menu) |
{ |
} |
-HMENU ContextMenu::platformDescription() const |
+PlatformMenuDescription ContextMenu::platformDescription() const |
{ |
return m_platformDescription; |
} |
-HMENU ContextMenu::releasePlatformDescription() |
+PlatformMenuDescription ContextMenu::releasePlatformDescription() |
{ |
return 0; |
} |
Property changes on: webkit\port\platform\chromium\ContextMenuChromium.cpp |
___________________________________________________________________ |
Added: svn:mergeinfo |
Merged /branches/chrome_webkit_merge_branch/webkit/port/platform/ContextMenuWin.cpp:r69-2775 |