Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / renderer_context_menu / render_view_context_menu.h

diff --git a/src/chrome/browser/renderer_context_menu/render_view_context_menu.h b/src/chrome/browser/renderer_context_menu/render_view_context_menu.h
index 3de0070..0d1c174 100644 (file)
--- a/src/chrome/browser/renderer_context_menu/render_view_context_menu.h
+++ b/src/chrome/browser/renderer_context_menu/render_view_context_menu.h
@@ -141,7 +141,8 @@ class RenderViewContextMenu : public ui::SimpleMenuModel::Delegate,
   // Programmatically closes the context menu.
   void Cancel();
 
-  const ui::MenuModel& menu_model() const { return menu_model_; }
+  const ui::SimpleMenuModel& menu_model() const { return menu_model_; }
+  const content::ContextMenuParams& params() const { return params_; }
 
   // SimpleMenuModel::Delegate implementation.
   virtual bool IsCommandIdChecked(int command_id) const OVERRIDE;
@@ -210,6 +211,7 @@ class RenderViewContextMenu : public ui::SimpleMenuModel::Delegate,
   void AppendLinkItems();
   void AppendImageItems();
   void AppendAudioItems();
+  void AppendCanvasItems();
   void AppendVideoItems();
   void AppendMediaItems();
   void AppendPluginItems();
@@ -225,7 +227,6 @@ class RenderViewContextMenu : public ui::SimpleMenuModel::Delegate,
   void AppendSearchWebForImageItems();
   void AppendSpellingSuggestionsSubMenu();
   void AppendSpellcheckOptionsSubMenu();
-  void AppendSpeechInputOptionsSubMenu();
   void AppendProtocolHandlerSubMenu();
 
   // Opens the specified URL string in a new tab.
@@ -264,7 +265,6 @@ class RenderViewContextMenu : public ui::SimpleMenuModel::Delegate,
   // a text selection.
   GURL selection_navigation_url_;
 
-  ui::SimpleMenuModel speech_input_submenu_model_;
   ui::SimpleMenuModel protocol_handler_submenu_model_;
   ProtocolHandlerRegistry* protocol_handler_registry_;