Move ContextMenuParams struct from webkit/glue to content/public/common. The reasons are:

content/renderer/pepper_plugin_delegate_impl.cc

 // 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 "content/renderer/pepper_plugin_delegate_impl.h"
 
 #include <cmath>
 #include <queue>
 
 #include "base/bind.h"
@@ skipping 14 matching lines @@
 #include "content/common/file_system_messages.h"
 #include "content/common/gpu/client/content_gl_context.h"
 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
 #include "content/common/media/audio_messages.h"
 #include "content/common/pepper_file_messages.h"
 #include "content/common/pepper_plugin_registry.h"
 #include "content/common/pepper_messages.h"
 #include "content/common/quota_dispatcher.h"
 #include "content/common/view_messages.h"
 #include "content/public/common/content_switches.h"
+#include "content/public/common/context_menu_params.h"
 #include "content/public/renderer/content_renderer_client.h"
 #include "content/renderer/gamepad_shared_memory_reader.h"
 #include "content/renderer/media/audio_input_message_filter.h"
 #include "content/renderer/media/audio_message_filter.h"
 #include "content/renderer/media/pepper_platform_video_decoder_impl.h"
 #include "content/renderer/media/video_capture_impl_manager.h"
 #include "content/renderer/p2p/p2p_transport_impl.h"
 #include "content/renderer/pepper_platform_context_3d_impl.h"
 #include "content/renderer/render_thread_impl.h"
 #include "content/renderer/render_view_impl.h"
@@ skipping 15 matching lines @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileChooserCompletion.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileChooserParams.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginContainer.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "ui/gfx/size.h"
 #include "ui/gfx/surface/transport_dib.h"
 #include "webkit/fileapi/file_system_callback_dispatcher.h"
-#include "webkit/glue/context_menu.h"
 #include "webkit/plugins/npapi/webplugin.h"
 #include "webkit/plugins/ppapi/file_path.h"
 #include "webkit/plugins/ppapi/ppb_file_io_impl.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 #include "webkit/plugins/ppapi/ppb_broker_impl.h"
 #include "webkit/plugins/ppapi/ppb_flash_impl.h"
 #include "webkit/plugins/ppapi/ppb_flash_net_connector_impl.h"
 #include "webkit/plugins/ppapi/ppb_tcp_socket_private_impl.h"
 #include "webkit/plugins/ppapi/ppb_udp_socket_private_impl.h"
@@ skipping 1676 matching lines @@
     webkit::ppapi::FullscreenContainer* container =
         instance->fullscreen_container();
     DCHECK(container);
     render_widget_id =
         static_cast<RenderWidgetFullscreenPepper*>(container)->routing_id();
   }
 
   int request_id = pending_context_menus_.Add(
       new scoped_refptr<webkit::ppapi::PPB_Flash_Menu_Impl>(menu));
 
-  ContextMenuParams params;
+  content::ContextMenuParams params;
   params.x = position.x();
   params.y = position.y();
   params.custom_context.is_pepper_menu = true;
   params.custom_context.request_id = request_id;
   params.custom_context.render_widget_id = render_widget_id;
   params.custom_items = menu->menu_data();
 
   // Transform the position to be in render view's coordinates.
   if (instance->view_data().is_fullscreen ||
       instance->FlashIsFullscreen(instance->pp_instance())) {
     WebKit::WebRect rect = render_view_->windowRect();
     params.x -= rect.x;
     params.y -= rect.y;
   } else {
     params.x += instance->view_data().rect.point.x;
     params.y += instance->view_data().rect.point.y;
   }
 
   IPC::Message* msg = new ViewHostMsg_ContextMenu(render_view_->routing_id(),
                                                   params);
   if (!render_view_->Send(msg)) {
     pending_context_menus_.Remove(request_id);
     return PP_ERROR_FAILED;
   }
 
   return PP_OK_COMPLETIONPENDING;
 }
 
 void PepperPluginDelegateImpl::OnContextMenuClosed(
-    const webkit_glue::CustomContextMenuContext& custom_context) {
+    const content::CustomContextMenuContext& custom_context) {
   int request_id = custom_context.request_id;
   scoped_refptr<webkit::ppapi::PPB_Flash_Menu_Impl>* menu_ptr =
       pending_context_menus_.Lookup(request_id);
   if (!menu_ptr) {
     NOTREACHED() << "CompleteShowContextMenu() called twice for the same menu.";
     return;
   }
   scoped_refptr<webkit::ppapi::PPB_Flash_Menu_Impl> menu = *menu_ptr;
   DCHECK(menu.get());
   pending_context_menus_.Remove(request_id);
 
   if (has_saved_context_menu_action_) {
     menu->CompleteShow(PP_OK, saved_context_menu_action_);
     has_saved_context_menu_action_ = false;
     saved_context_menu_action_ = 0;
   } else {
     menu->CompleteShow(PP_ERROR_USERCANCEL, 0);
   }
 }
 
 void PepperPluginDelegateImpl::OnCustomContextMenuAction(
-    const webkit_glue::CustomContextMenuContext& custom_context,
+    const content::CustomContextMenuContext& custom_context,
     unsigned action) {
   // Just save the action.
   DCHECK(!has_saved_context_menu_action_);
   has_saved_context_menu_action_ = true;
   saved_context_menu_action_ = action;
 }
 
 webkit::ppapi::FullscreenContainer*
 PepperPluginDelegateImpl::CreateFullscreenContainer(
     webkit::ppapi::PluginInstance* instance) {
@@ skipping 276 matching lines @@
 void PepperPluginDelegateImpl::UnSetAndDeleteLockTargetAdapter(
     webkit::ppapi::PluginInstance* instance) {
   LockTargetMap::iterator it = mouse_lock_instances_.find(instance);
   if (it != mouse_lock_instances_.end()) {
     MouseLockDispatcher::LockTarget* target = it->second;
     render_view_->mouse_lock_dispatcher()->OnLockTargetDestroyed(target);
     delete target;
     mouse_lock_instances_.erase(it);
   }
 }