Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(50)

Unified Diff: webkit/glue/webmenuitem.h

Issue 6253017: Pepper/Flapper: First pass at context menu implementation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: make brettw happier Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/glue/webkit_glue.gypi ('k') | webkit/plugins/ppapi/mock_plugin_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/webmenuitem.h
diff --git a/webkit/glue/webmenuitem.h b/webkit/glue/webmenuitem.h
index f2eb448c4cc0ba12f219d0a76e98a7da7f5b36e6..c767bea7f7a7cfebd81db9d436457c3365f21456 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) {
}
« no previous file with comments | « webkit/glue/webkit_glue.gypi ('k') | webkit/plugins/ppapi/mock_plugin_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698