move webmenuitem from webkit/glue/ to webkit/common/

TBR=jam@chromium.org
R=jamesr@chromium.org
BUG=239107

Review URL: https://chromiumcodereview.appspot.com/16576008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206549 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 3 insertions, 85 deletions

diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index 1d341e7..6719df8 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -123,6 +123,8 @@
         '../common/webdropdata.cc',
         '../common/webdropdata.h',
         '../common/webkit_common_export.h',
+        '../common/webmenuitem.cc',
+        '../common/webmenuitem.h',
         '../common/webpreferences.cc',
         '../common/webpreferences.h',
         'multipart_response_delegate.cc',
@@ -271,8 +273,6 @@
         'webkit_glue_export.h',
         'webkitplatformsupport_impl.cc',
         'webkitplatformsupport_impl.h',
-        'webmenuitem.cc',
-        'webmenuitem.h',
         'webmenurunner_mac.h',
         'webmenurunner_mac.mm',
         'websocketstreamhandle_bridge.h',
diff --git a/webkit/glue/webmenuitem.cc b/webkit/glue/webmenuitem.cc
deleted file mode 100644
index 0b8c37e..0000000
--- a/webkit/glue/webmenuitem.cc
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (c) 2012 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.
-
-#include "webkit/glue/webmenuitem.h"
-
-WebMenuItem::WebMenuItem()
-    : type(OPTION),
-      action(0),
-      rtl(false),
-      has_directional_override(false),
-      enabled(false),
-      checked(false) {
-}
-
-WebMenuItem::WebMenuItem(const WebKit::WebMenuItemInfo& item)
-    : label(item.label),
-      toolTip(item.toolTip),
-      type(static_cast<Type>(item.type)),
-      action(item.action),
-      rtl(item.textDirection == WebKit::WebTextDirectionRightToLeft),
-      has_directional_override(item.hasTextDirectionOverride),
-      enabled(item.enabled),
-      checked(item.checked) {
-  for (size_t i = 0; i < item.subMenuItems.size(); ++i)
-    submenu.push_back(WebMenuItem(item.subMenuItems[i]));
-}
-
-WebMenuItem::WebMenuItem(const WebMenuItem& item)
-    : label(item.label),
-      toolTip(item.toolTip),
-      type(item.type),
-      action(item.action),
-      rtl(item.rtl),
-      has_directional_override(item.has_directional_override),
-      enabled(item.enabled),
-      checked(item.checked),
-      submenu(item.submenu) {
-}
-
-WebMenuItem::~WebMenuItem() {}
diff --git a/webkit/glue/webmenuitem.h b/webkit/glue/webmenuitem.h
deleted file mode 100644
index 155dea1..0000000
--- a/webkit/glue/webmenuitem.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// 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/strings/string16.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebMenuItemInfo.h"
-#include "webkit/glue/webkit_glue_export.h"
-
-// Container for information about entries in an HTML select popup menu and
-// custom entries of the context menu.
-struct WEBKIT_GLUE_EXPORT WebMenuItem {
-  enum Type {
-    OPTION    = WebKit::WebMenuItemInfo::Option,
-    CHECKABLE_OPTION = WebKit::WebMenuItemInfo::CheckableOption,
-    GROUP     = WebKit::WebMenuItemInfo::Group,
-    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();
-
-  base::string16 label;
-  base::string16 toolTip;
-  Type type;
-  unsigned action;
-  bool rtl;
-  bool has_directional_override;
-  bool enabled;
-  bool checked;
-  std::vector<WebMenuItem> submenu;
-};
-
-#endif  // WEBMENUITEM_H_
diff --git a/webkit/glue/webmenurunner_mac.h b/webkit/glue/webmenurunner_mac.h
index f722b1e..7873745 100644
--- a/webkit/glue/webmenurunner_mac.h
+++ b/webkit/glue/webmenurunner_mac.h
@@ -10,8 +10,8 @@
 #include <vector>
 
 #include "base/memory/scoped_nsobject.h"
+#include "webkit/common/webmenuitem.h"
 #include "webkit/glue/webkit_glue_export.h"
-#include "webkit/glue/webmenuitem.h"
 
 
 // WebMenuRunner ---------------------------------------------------------------