diff options
Diffstat (limited to 'webkit/glue/webmenuitem.h')
| -rw-r--r-- | webkit/glue/webmenuitem.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/webkit/glue/webmenuitem.h b/webkit/glue/webmenuitem.h index 4b0fdc3..685033e 100644 --- a/webkit/glue/webmenuitem.h +++ b/webkit/glue/webmenuitem.h @@ -1,12 +1,14 @@ -// 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/WebKit/chromium/public/WebMenuItemInfo.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebMenuItemInfo.h" // Container for information about entries in an HTML select popup menu and // custom entries of the context menu. @@ -15,25 +17,23 @@ 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. }; + WebMenuItem(); + WebMenuItem(const WebKit::WebMenuItemInfo& item); + WebMenuItem(const WebMenuItem& item); + ~WebMenuItem(); + string16 label; Type type; unsigned action; + bool rtl; + bool has_directional_override; bool enabled; bool checked; - - WebMenuItem() : type(OPTION), action(0), enabled(false), checked(false) { - } - - WebMenuItem(const WebKit::WebMenuItemInfo& item) - : label(item.label), - type(static_cast<Type>(item.type)), - action(item.action), - enabled(item.enabled), - checked(item.checked) { - } + std::vector<WebMenuItem> submenu; }; #endif // WEBMENUITEM_H_ |