diff options
author | Steve Block <steveblock@google.com> | 2009-12-15 10:12:09 +0000 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2009-12-17 17:41:10 +0000 |
commit | 643ca7872b450ea4efacab6188849e5aac2ba161 (patch) | |
tree | 6982576c228bcd1a7efe98afed544d840751094c /WebCore/platform/ContextMenuItem.h | |
parent | d026980fde6eb3b01c1fe49441174e89cd1be298 (diff) | |
download | external_webkit-643ca7872b450ea4efacab6188849e5aac2ba161.zip external_webkit-643ca7872b450ea4efacab6188849e5aac2ba161.tar.gz external_webkit-643ca7872b450ea4efacab6188849e5aac2ba161.tar.bz2 |
Merge webkit.org at r51976 : Initial merge by git.
Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
Diffstat (limited to 'WebCore/platform/ContextMenuItem.h')
-rw-r--r-- | WebCore/platform/ContextMenuItem.h | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/WebCore/platform/ContextMenuItem.h b/WebCore/platform/ContextMenuItem.h index 6b9d0a9..b4c97a5 100644 --- a/WebCore/platform/ContextMenuItem.h +++ b/WebCore/platform/ContextMenuItem.h @@ -143,6 +143,7 @@ namespace WebCore { ContextMenuItemTagCapitalize, ContextMenuItemTagChangeBack, #endif + ContextMenuItemBaseCustomTag = 5000, ContextMenuItemBaseApplicationTag = 10000 }; @@ -210,11 +211,24 @@ namespace WebCore { }; #elif PLATFORM(HAIKU) typedef BMenuItem* PlatformMenuItemDescription; +#elif PLATFORM(CHROMIUM) + struct PlatformMenuItemDescription { + PlatformMenuItemDescription() + : type(ActionType) + , action(ContextMenuItemTagNoAction) + , checked(false) + , enabled(true) { } + ContextMenuItemType type; + ContextMenuAction action; + String title; + bool checked; + bool enabled; + }; #else typedef void* PlatformMenuItemDescription; #endif - class ContextMenuItem { + class ContextMenuItem : public FastAllocBase { public: ContextMenuItem(PlatformMenuItemDescription); ContextMenuItem(ContextMenu* subMenu = 0); @@ -239,7 +253,8 @@ namespace WebCore { void setSubMenu(ContextMenu*); void setChecked(bool = true); - + bool checked() const; + void setEnabled(bool = true); bool enabled() const; |