diff options
| author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-31 21:41:08 +0000 |
|---|---|---|
| committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-31 21:41:08 +0000 |
| commit | b29aa74b75d57e1dc78bb151f1b7b2153d13ae3f (patch) | |
| tree | c06576af8874b736101b045e4e1d75cfed7ba897 /webkit/glue/webmenuitem.h | |
| parent | 314e594492cfd5c23225763cb46c5cd190b5551c (diff) | |
| download | chromium_src-b29aa74b75d57e1dc78bb151f1b7b2153d13ae3f.zip chromium_src-b29aa74b75d57e1dc78bb151f1b7b2153d13ae3f.tar.gz chromium_src-b29aa74b75d57e1dc78bb151f1b7b2153d13ae3f.tar.bz2 | |
Pepper/Flapper: First pass at context menu implementation.
This meets the needs of Flapper. We may want to generalize/restrict/modify the
API for inclusion into PPAPI, but hopefully this lays a foundation.
BUG=none
TEST=Flapper context menus work (with the right version of Flapper)
Review URL: http://codereview.chromium.org/6253017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73193 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webmenuitem.h')
| -rw-r--r-- | webkit/glue/webmenuitem.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/webkit/glue/webmenuitem.h b/webkit/glue/webmenuitem.h index f2eb448..c767bea 100644 --- a/webkit/glue/webmenuitem.h +++ b/webkit/glue/webmenuitem.h @@ -1,10 +1,12 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #ifndef WEBMENUITEM_H_ #define WEBMENUITEM_H_ +#include <vector> + #include "base/string16.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebMenuItemInfo.h" @@ -15,7 +17,8 @@ struct WebMenuItem { OPTION = WebKit::WebMenuItemInfo::Option, CHECKABLE_OPTION = WebKit::WebMenuItemInfo::CheckableOption, GROUP = WebKit::WebMenuItemInfo::Group, - SEPARATOR = WebKit::WebMenuItemInfo::Separator + SEPARATOR = WebKit::WebMenuItemInfo::Separator, + SUBMENU // This is currently only used by Pepper, not by WebKit. }; string16 label; @@ -23,6 +26,7 @@ struct WebMenuItem { unsigned action; bool enabled; bool checked; + std::vector<WebMenuItem> submenu; WebMenuItem() : type(OPTION), action(0), enabled(false), checked(false) { } |