Moved ExtensionMenuManager and ExtensionMenuItem into extensions namespace

chrome/browser/tab_contents/render_view_context_menu.h

 // 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.
 
 #ifndef CHROME_BROWSER_TAB_CONTENTS_RENDER_VIEW_CONTEXT_MENU_H_
 #define CHROME_BROWSER_TAB_CONTENTS_RENDER_VIEW_CONTEXT_MENU_H_
 #pragma once
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/observer_list.h"
 #include "base/string16.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
-#include "chrome/browser/extensions/extension_menu_manager.h"
+#include "chrome/browser/extensions/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/window_open_disposition.h"
 
-class ExtensionMenuItem;
 class PrintPreviewContextMenuObserver;
 class Profile;
 class SpellingMenuObserver;
 class SpellCheckerSubMenuObserver;
 
 namespace content {
 class RenderViewHost;
 class WebContents;
 }
 
 namespace extensions {
 class Extension;
+class MenuItem;
 }
 
 namespace gfx {
 class Point;
 }
 
 namespace WebKit {
 struct WebMediaPlayerAction;
 struct WebPluginAction;
 }
@@ skipping 123 matching lines @@
  protected:
   void InitMenu();
 
   // Platform specific functions.
   virtual void PlatformInit() = 0;
   virtual void PlatformCancel() = 0;
   virtual bool GetAcceleratorForCommandId(
       int command_id,
       ui::Accelerator* accelerator) = 0;
 
-  // Attempts to get an ExtensionMenuItem given the id of a context menu item.
-  ExtensionMenuItem* GetExtensionMenuItem(int id) const;
+  // Attempts to get an MenuItem given the id of a context menu item.
+  extensions::MenuItem* GetExtensionMenuItem(int id) const;
 
   content::ContextMenuParams params_;
   content::WebContents* source_web_contents_;
   Profile* profile_;
 
   ui::SimpleMenuModel menu_model_;
 
   // True if we are showing for an external tab contents. The default is false.
   bool external_;
 
-  // Maps the id from a context menu item to the ExtensionMenuItem's internal
-  // id.
-  std::map<int, ExtensionMenuItem::Id> extension_item_map_;
+  // Maps the id from a context menu item to the MenuItem's internal id.
+  std::map<int, extensions::MenuItem::Id> extension_item_map_;
 
  private:
   friend class RenderViewContextMenuTest;
 
   static bool IsDevToolsURL(const GURL& url);
   static bool IsInternalResourcesURL(const GURL& url);
   static bool ExtensionContextAndPatternMatch(
       const content::ContextMenuParams& params,
-      ExtensionMenuItem::ContextList contexts,
+      extensions::MenuItem::ContextList contexts,
       const URLPatternSet& target_url_patterns);
-  static ExtensionMenuItem::List GetRelevantExtensionItems(
-      const ExtensionMenuItem::List& items,
+  static extensions::MenuItem::List GetRelevantExtensionItems(
+      const extensions::MenuItem::List& items,
       const content::ContextMenuParams& params,
       Profile* profile,
       bool can_cross_incognito);
 
   // Gets the extension (if any) associated with the WebContents that we're in.
   const extensions::Extension* GetExtension() const;
   void AppendPlatformAppItems();
   void AppendPopupExtensionItems();
   bool AppendCustomItems();
   void AppendDeveloperItems();
@@ skipping 16 matching lines @@
   void AppendBidiSubMenu();
   void AppendProtocolHandlerSubMenu();
 
   // This is a helper function to append items for one particular extension.
   // The |index| parameter is used for assigning id's, and is incremented for
   // each item actually added.
   void AppendExtensionItems(const std::string& extension_id, int* index);
 
   // Used for recursively adding submenus of extension items.
   void RecursivelyAppendExtensionItems(
-      const std::vector<ExtensionMenuItem*>& items,
+      const std::vector<extensions::MenuItem*>& items,
       bool can_cross_incognito,
       ui::SimpleMenuModel* menu_model,
       int* index);
   // This will set the icon on the most recently-added item in the menu_model_.
   void SetExtensionIcon(const std::string& extension_id);
 
   // Opens the specified URL string in a new tab.  The |frame_id| specifies the
   // frame in which the context menu was displayed, or 0 if the menu action is
   // independent of that frame (e.g. protocol handler settings).
   void OpenURL(const GURL& url, const GURL& referrer, int64 frame_id,
@@ skipping 43 matching lines @@
   // An observer that disables menu items when print preview is active.
   scoped_ptr<PrintPreviewContextMenuObserver> print_preview_menu_observer_;
 
   // Our observers.
   mutable ObserverList<RenderViewContextMenuObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderViewContextMenu);
 };
 
 #endif  // CHROME_BROWSER_TAB_CONTENTS_RENDER_VIEW_CONTEXT_MENU_H_