Desktop context menu reorganisation

chrome/browser/renderer_context_menu/render_view_context_menu.h

 // Copyright 2014 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_RENDERER_CONTEXT_MENU_RENDER_VIEW_CONTEXT_MENU_H_
 #define CHROME_BROWSER_RENDERER_CONTEXT_MENU_RENDER_VIEW_CONTEXT_MENU_H_
 
 #include <map>
 #include <string>
 
@@ skipping 64 matching lines @@
   // Returns a (possibly truncated) version of the current selection text
   // suitable for putting in the title of a menu item.
   base::string16 PrintableSelectionText();
 
   // Helper function to escape "&" as "&&".
   void EscapeAmpersands(base::string16* text);
 
 #if defined(ENABLE_EXTENSIONS)
   extensions::ContextMenuMatcher extension_items_;
 #endif
+  void RecordUsedItem(int id) override;
 
  private:
   friend class RenderViewContextMenuTest;
   friend class RenderViewContextMenuPrefsTest;
 
   static bool IsDevToolsURL(const GURL& url);
   static bool IsInternalResourcesURL(const GURL& url);
 #if defined(ENABLE_EXTENSIONS)
   static bool ExtensionContextAndPatternMatch(
       const content::ContextMenuParams& params,
       const extensions::MenuItem::ContextList& contexts,
       const extensions::URLPatternSet& target_url_patterns);
   static bool MenuItemMatchesParams(const content::ContextMenuParams& params,
                                     const extensions::MenuItem* item);
 #endif
 
   // RenderViewContextMenuBase:
   void InitMenu() override;
   void RecordShownItem(int id) override;
-  void RecordUsedItem(int id) override;
 #if defined(ENABLE_PLUGINS)
   void HandleAuthorizeAllPlugins() override;
 #endif
   void NotifyMenuShown() override;
   void NotifyURLOpened(const GURL& url,
                        content::WebContents* new_contents) override;
 
   // Gets the extension (if any) associated with the WebContents that we're in.
   const extensions::Extension* GetExtension() const;
 
   void AppendDeveloperItems();
   void AppendDevtoolsForUnpackedExtensions();
   void AppendLinkItems();
   void AppendImageItems();
   void AppendAudioItems();
   void AppendCanvasItems();
   void AppendVideoItems();
-  void AppendMediaItems();
   void AppendPluginItems();
   void AppendPageItems();
-  void AppendFrameItems();
   void AppendCopyItem();
   void AppendPrintItem();
   void AppendRotationItems();
   void AppendEditableItems();
+  void AppendLanguageSettings();
   void AppendSearchProvider();
 #if defined(ENABLE_EXTENSIONS)
   void AppendAllExtensionItems();
   void AppendCurrentExtensionItems();
 #endif
   void AppendPrintPreviewItems();
   void AppendSearchWebForImageItems();
   void AppendSpellingSuggestionsSubMenu();
-  void AppendSpellcheckOptionsSubMenu();
   void AppendProtocolHandlerSubMenu();
   void AppendPasswordItems();
 
   // Copy to the clipboard an image located at a point in the RenderView
   void CopyImageAt(int x, int y);
 
   // Load the original image located at a point in the RenderView.
   void LoadOriginalImage();
 
   // Get an image located at a point in the RenderView for search.
@@ skipping 19 matching lines @@
   // The destination URL to use if the user tries to search for or navigate to
   // a text selection.
   GURL selection_navigation_url_;
 
   ui::SimpleMenuModel protocol_handler_submenu_model_;
   ProtocolHandlerRegistry* protocol_handler_registry_;
 
   // An observer that handles spelling-menu items.
   scoped_ptr<SpellingMenuObserver> spelling_menu_observer_;
 
-  // An observer that handles a 'spell-checker options' submenu.
-  scoped_ptr<SpellCheckerSubMenuObserver> spellchecker_submenu_observer_;
-
 #if defined(ENABLE_PRINT_PREVIEW)
   // An observer that disables menu items when print preview is active.
   scoped_ptr<PrintPreviewContextMenuObserver> print_preview_menu_observer_;
 #endif
 
   // In the case of a MimeHandlerView this will point to the WebContents that
   // embeds the MimeHandlerViewGuest. Otherwise this will be the same as
   // |source_web_contents_|.
   content::WebContents* const embedder_web_contents_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderViewContextMenu);
 };
 
 #endif  // CHROME_BROWSER_RENDERER_CONTEXT_MENU_RENDER_VIEW_CONTEXT_MENU_H_