| 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..7d72f70388aca15385f0605ed4730bd00a2496c9 100644
|
| --- a/chrome/browser/tab_contents/render_view_context_menu.h
|
| +++ b/chrome/browser/tab_contents/render_view_context_menu.h
|
| @@ -11,6 +11,7 @@
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/observer_list.h"
|
| #include "base/strings/string16.h"
|
| +#include "chrome/browser/context_menu/context_menu_content_type.h"
|
| #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
|
| #include "chrome/browser/extensions/context_menu_matcher.h"
|
| #include "chrome/browser/extensions/menu_manager.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,10 @@ 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();
|
| +
|
| void AppendDeveloperItems();
|
| + void AppendDevtoolsForUnpackedExtensions();
|
| void AppendLinkItems();
|
| void AppendImageItems();
|
| void AppendAudioItems();
|
| @@ -222,6 +221,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 +289,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<ContextMenuContentType> content_type_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(RenderViewContextMenu);
|
| };
|
|
|