Chromium Code Reviews| Index: chrome/browser/tab_contents/render_view_context_menu.h |
| diff --git a/chrome/browser/tab_contents/render_view_context_menu.h b/chrome/browser/tab_contents/render_view_context_menu.h |
| index 732ac75b7e422c49bfe56320cd42a15fb1bb9b8b..629025bb7bdb6f9100c398914866d7505036c7ca 100644 |
| --- a/chrome/browser/tab_contents/render_view_context_menu.h |
| +++ b/chrome/browser/tab_contents/render_view_context_menu.h |
| @@ -14,6 +14,7 @@ |
| #include "chrome/browser/custom_handlers/protocol_handler_registry.h" |
| #include "chrome/browser/extensions/context_menu_matcher.h" |
| #include "chrome/browser/extensions/menu_manager.h" |
| +#include "chrome/browser/tab_contents/menu_category_base.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" |
| @@ -149,7 +150,7 @@ class RenderViewContextMenu : public ui::SimpleMenuModel::Delegate, |
| virtual void MenuWillShow(ui::SimpleMenuModel* source) OVERRIDE; |
| virtual void MenuClosed(ui::SimpleMenuModel* source) OVERRIDE; |
| - // RenderViewContextMenuDelegate implementation. |
| + // RenderViewContextMenuProxy implementation. |
| virtual void AddMenuItem(int command_id, |
| const base::string16& title) OVERRIDE; |
| virtual void AddCheckItem(int command_id, |
| @@ -203,12 +204,9 @@ class RenderViewContextMenu : public ui::SimpleMenuModel::Delegate, |
| // Gets the extension (if any) associated with the WebContents that we're in. |
| const extensions::Extension* GetExtension() const; |
| - void AppendAppModeItems(); |
| - void AppendPlatformAppItems(); |
| - void AppendPopupExtensionItems(); |
| - void AppendPanelItems(); |
| bool AppendCustomItems(); |
|
Avi (use Gerrit)
2014/02/22 01:37:45
blank line above this
lazyboy
2014/02/24 23:45:00
Done.
|
| void AppendDeveloperItems(); |
| + void AppendDevtoolsForUnpackedExtensions(); |
| void AppendLinkItems(); |
| void AppendImageItems(); |
| void AppendAudioItems(); |
| @@ -222,6 +220,9 @@ class RenderViewContextMenu : public ui::SimpleMenuModel::Delegate, |
| void AppendEditableItems(); |
| void AppendSearchProvider(); |
| void AppendAllExtensionItems(); |
| + void AppendCurrentExtensionItems(); |
| + void AppendPrintPreviewItems(); |
| + void AppendSearchWebForImageItems(); |
| void AppendSpellingSuggestionsSubMenu(); |
| void AppendSpellcheckOptionsSubMenu(); |
| void AppendSpeechInputOptionsSubMenu(); |
| @@ -287,12 +288,7 @@ class RenderViewContextMenu : public ui::SimpleMenuModel::Delegate, |
| // should be notified of menu closing without execution. |
| bool command_executed_; |
| - // Whether or not the menu was triggered for a browser plugin guest. |
| - // Guests are rendered inside chrome apps, but have most of the actions |
| - // that a regular web page has. |
| - // Currently actions/items that are suppressed from guests are: searching, |
| - // printing, speech and instant. |
| - bool is_guest_; |
| + scoped_ptr<MenuCategoryBase> menu_category_; |
| DISALLOW_COPY_AND_ASSIGN(RenderViewContextMenu); |
| }; |