Pepper/Flapper: First pass at context menu implementation.

webkit/glue/webmenuitem.h

Index: webkit/glue/webmenuitem.h
diff --git a/webkit/glue/webmenuitem.h b/webkit/glue/webmenuitem.h
index f2eb448c4cc0ba12f219d0a76e98a7da7f5b36e6..edc490cc057abc09ae5941205d707b0f106b9c09 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,9 @@ struct WebMenuItem {
     OPTION    = WebKit::WebMenuItemInfo::Option,
     CHECKABLE_OPTION = WebKit::WebMenuItemInfo::CheckableOption,
     GROUP     = WebKit::WebMenuItemInfo::Group,
-    SEPARATOR = WebKit::WebMenuItemInfo::Separator
+    SEPARATOR = WebKit::WebMenuItemInfo::Separator,
+    // TODO(viettrungluu): This is currently not supported/used by WebKit.

[brettw, 2011/01/31 18:19:49]

It's not clear to me what this comment means. Is the TODO to make it used by
WebKit? I assume it's used by Pepper now? Maybe the comment should just say that
it's currently used by Pepper only and isn't supported by WebKit, without the
TODO.

[viettrungluu, 2011/01/31 20:31:14]

Done.

+    SUBMENU
   };
 
   string16 label;
@@ -23,6 +27,7 @@ struct WebMenuItem {
   unsigned action;
   bool enabled;
   bool checked;
+  std::vector<WebMenuItem> submenu;
 
   WebMenuItem() : type(OPTION), action(0), enabled(false), checked(false) {
   }