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

-this struct wasn't used at all in webkit layer, so no need to have it there
-we can avoid exposing content layer's serialization of SSLInfo to embedders
-avoid mentioning routing_ids in the webkit layer

BUG=98716
Review URL: https://chromiumcodereview.appspot.com/9382037

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

1 files changed, 5 insertions, 5 deletions

diff --git a/chrome/browser/tab_contents/render_view_context_menu.h b/chrome/browser/tab_contents/render_view_context_menu.h
index 84cf934..4478011 100644
--- a/chrome/browser/tab_contents/render_view_context_menu.h
+++ b/chrome/browser/tab_contents/render_view_context_menu.h
@@ -17,9 +17,9 @@
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
 #include "chrome/browser/extensions/extension_menu_manager.h"
 #include "chrome/browser/tab_contents/render_view_context_menu_observer.h"
+#include "content/public/common/context_menu_params.h"
 #include "content/public/common/page_transition_types.h"
 #include "ui/base/models/simple_menu_model.h"
-#include "webkit/glue/context_menu.h"
 #include "webkit/glue/window_open_disposition.h"
 
 class ExtensionMenuItem;
@@ -122,7 +122,7 @@ class RenderViewContextMenu : public ui::SimpleMenuModel::Delegate,
   static const size_t kMaxSelectionTextLength;
 
   RenderViewContextMenu(content::WebContents* web_contents,
-                        const ContextMenuParams& params);
+                        const content::ContextMenuParams& params);
 
   virtual ~RenderViewContextMenu();
 
@@ -166,7 +166,7 @@ class RenderViewContextMenu : public ui::SimpleMenuModel::Delegate,
   // Attempts to get an ExtensionMenuItem given the id of a context menu item.
   ExtensionMenuItem* GetExtensionMenuItem(int id) const;
 
-  ContextMenuParams params_;
+  content::ContextMenuParams params_;
   content::WebContents* source_web_contents_;
   Profile* profile_;
 
@@ -186,12 +186,12 @@ class RenderViewContextMenu : public ui::SimpleMenuModel::Delegate,
   static bool IsDevToolsURL(const GURL& url);
   static bool IsInternalResourcesURL(const GURL& url);
   static bool ExtensionContextAndPatternMatch(
-      const ContextMenuParams& params,
+      const content::ContextMenuParams& params,
       ExtensionMenuItem::ContextList contexts,
       const URLPatternSet& target_url_patterns);
   static ExtensionMenuItem::List GetRelevantExtensionItems(
       const ExtensionMenuItem::List& items,
-      const ContextMenuParams& params,
+      const content::ContextMenuParams& params,
       Profile* profile,
       bool can_cross_incognito);