Refactor the "spell-checker options" submenu.

chrome/browser/tab_contents/render_view_context_menu.h

Index: chrome/browser/tab_contents/render_view_context_menu.h
===================================================================
--- chrome/browser/tab_contents/render_view_context_menu.h	(revision 107682)
+++ chrome/browser/tab_contents/render_view_context_menu.h	(working copy)
@@ -27,6 +27,7 @@
 class RenderViewHost;
 class TabContents;
 class SpellingMenuObserver;
+class SpellCheckerSubMenuObserver;
 
 namespace gfx {
 class Point;
@@ -91,6 +92,11 @@
   // Add a menu item to a context menu.
   virtual void AddMenuItem(int command_id, const string16& title) = 0;
 
+  // Add a submenu item to a context menu.
+  virtual void AddSubMenu(int command_id,
+                          const string16& label,
+                          ui::MenuModel* model) = 0;
+
   // Update the status and text of the specified context-menu item.
   virtual void UpdateMenuItem(int command_id,
                               bool enabled,
@@ -130,12 +136,15 @@
 
   // RenderViewContextMenuDelegate implementation.
   virtual void AddMenuItem(int command_id, const string16& title) OVERRIDE;
+  virtual void AddSubMenu(int command_id,
+                          const string16& label,
+                          ui::MenuModel* model) OVERRIDE;
   virtual void UpdateMenuItem(int command_id,
                               bool enabled,
                               bool hidden,
                               const string16& title) OVERRIDE;
-  virtual RenderViewHost* GetRenderViewHost() const;
-  virtual Profile* GetProfile() const;
+  virtual RenderViewHost* GetRenderViewHost() const OVERRIDE;
+  virtual Profile* GetProfile() const OVERRIDE;
 
  protected:
   void InitMenu();
@@ -245,16 +254,18 @@
   // a text selection.
   GURL selection_navigation_url_;
 
-  ui::SimpleMenuModel spellcheck_submenu_model_;
   ui::SimpleMenuModel speech_input_submenu_model_;
   ui::SimpleMenuModel bidi_submenu_model_;
   ui::SimpleMenuModel protocol_handler_submenu_model_;
   ScopedVector<ui::SimpleMenuModel> extension_menu_models_;
   scoped_refptr<ProtocolHandlerRegistry> protocol_handler_registry_;
 
-  // An observer that handles a spelling-menu items.
+  // 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_;
+
   // Our observers.
   mutable ObserverList<RenderViewContextMenuObserver> observers_;