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

10 files changed, 20 insertions, 21 deletions

diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS
index 26dfbb3..8980d49 100644
--- a/chrome/browser/DEPS
+++ b/chrome/browser/DEPS
@@ -69,7 +69,6 @@ include_rules = [
   "+webkit/glue/image_decoder.h",
   "+webkit/glue/resource_type.h",
   "+webkit/glue/webkit_glue.h",
-  "+webkit/glue/webmenuitem.h",
   # DO NOT ADD ANY MORE ITEMS TO THE ABOVE LIST!
 
   "-chrome/browser/ui/views",
diff --git a/chrome/browser/tab_contents/render_view_context_menu.cc b/chrome/browser/tab_contents/render_view_context_menu.cc
index 11e6149..85ef87e 100644
--- a/chrome/browser/tab_contents/render_view_context_menu.cc
+++ b/chrome/browser/tab_contents/render_view_context_menu.cc
@@ -93,7 +93,7 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/text/text_elider.h"
 #include "ui/gfx/favicon_size.h"
-#include "webkit/glue/webmenuitem.h"
+#include "webkit/common/webmenuitem.h"
 
 using WebKit::WebContextMenuData;
 using WebKit::WebMediaPlayerAction;
diff --git a/chrome/renderer/pepper/pepper_flash_menu_host.cc b/chrome/renderer/pepper/pepper_flash_menu_host.cc
index 4f63658..9924c21 100644
--- a/chrome/renderer/pepper/pepper_flash_menu_host.cc
+++ b/chrome/renderer/pepper/pepper_flash_menu_host.cc
@@ -6,15 +6,15 @@
 
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/common/context_menu_params.h"
-#include "content/public/renderer/renderer_ppapi_host.h"
 #include "content/public/renderer/render_view.h"
+#include "content/public/renderer/renderer_ppapi_host.h"
 #include "ppapi/c/private/ppb_flash_menu.h"
 #include "ppapi/host/dispatch_host_message.h"
 #include "ppapi/host/ppapi_host.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/proxy/serialized_flash_menu.h"
 #include "ui/gfx/point.h"
-#include "webkit/glue/webmenuitem.h"
+#include "webkit/common/webmenuitem.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 
 namespace chrome {
diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc
index 846fa91..72aad39 100644
--- a/content/browser/android/content_view_core_impl.cc
+++ b/content/browser/android/content_view_core_impl.cc
@@ -52,7 +52,7 @@
 #include "ui/gfx/size_conversions.h"
 #include "ui/gfx/size_f.h"
 #include "webkit/common/user_agent/user_agent_util.h"
-#include "webkit/glue/webmenuitem.h"
+#include "webkit/common/webmenuitem.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertJavaStringToUTF16;
diff --git a/content/common/view_messages.h b/content/common/view_messages.h
index 6956da8..e4cf8e3 100644
--- a/content/common/view_messages.h
+++ b/content/common/view_messages.h
@@ -36,8 +36,6 @@
 #include "media/audio/audio_parameters.h"
 #include "media/base/channel_layout.h"
 #include "media/base/media_log_event.h"
-#include "third_party/WebKit/public/platform/WebFloatPoint.h"
-#include "third_party/WebKit/public/platform/WebFloatRect.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositionUnderline.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFindOptions.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerAction.h"
@@ -45,6 +43,8 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupType.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebTextDirection.h"
+#include "third_party/WebKit/public/platform/WebFloatPoint.h"
+#include "third_party/WebKit/public/platform/WebFloatRect.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/ime/text_input_type.h"
 #include "ui/base/range/range.h"
@@ -54,8 +54,8 @@
 #include "ui/gfx/vector2d.h"
 #include "ui/gfx/vector2d_f.h"
 #include "ui/shell_dialogs/selected_file_info.h"
+#include "webkit/common/webmenuitem.h"
 #include "webkit/glue/webcookie.h"
-#include "webkit/glue/webmenuitem.h"
 #include "webkit/plugins/npapi/webplugin.h"
 
 #if defined(OS_MACOSX)
diff --git a/content/public/common/context_menu_params.h b/content/public/common/context_menu_params.h
index 23f6dfe..756c7aa 100644
--- a/content/public/common/context_menu_params.h
+++ b/content/public/common/context_menu_params.h
@@ -13,9 +13,9 @@
 #include "content/public/common/page_state.h"
 #include "content/public/common/ssl_status.h"
 #include "googleurl/src/gurl.h"
-#include "third_party/WebKit/public/platform/WebReferrerPolicy.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebContextMenuData.h"
-#include "webkit/glue/webmenuitem.h"
+#include "third_party/WebKit/public/platform/WebReferrerPolicy.h"
+#include "webkit/common/webmenuitem.h"
 
 #if defined(OS_ANDROID)
 #include "ui/gfx/point.h"
diff --git a/webkit/glue/webmenuitem.cc b/webkit/common/webmenuitem.cc
index 0b8c37e..68c9a9e 100644
--- a/webkit/glue/webmenuitem.cc
+++ b/webkit/common/webmenuitem.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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"
+#include "webkit/common/webmenuitem.h"
 
 WebMenuItem::WebMenuItem()
     : type(OPTION),
diff --git a/webkit/glue/webmenuitem.h b/webkit/common/webmenuitem.h
index 155dea1..0d03f9b 100644
--- a/webkit/glue/webmenuitem.h
+++ b/webkit/common/webmenuitem.h
@@ -1,19 +1,19 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 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_
+#ifndef WEBKIT_COMMON_WEBMENUITEM_H_
+#define WEBKIT_COMMON_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"
+#include "webkit/common/webkit_common_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 {
+struct WEBKIT_COMMON_EXPORT WebMenuItem {
   enum Type {
     OPTION    = WebKit::WebMenuItemInfo::Option,
     CHECKABLE_OPTION = WebKit::WebMenuItemInfo::CheckableOption,
@@ -38,4 +38,4 @@ struct WEBKIT_GLUE_EXPORT WebMenuItem {
   std::vector<WebMenuItem> submenu;
 };
 
-#endif  // WEBMENUITEM_H_
+#endif  // WEBKIT_COMMON_WEBMENUITEM_H_
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/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 ---------------------------------------------------------------