Extend contextMenus API to support browser/page actions

chrome/browser/extensions/extension_context_menu_model.h

 // Copyright (c) 2012 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_EXTENSIONS_EXTENSION_CONTEXT_MENU_MODEL_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_CONTEXT_MENU_MODEL_H_
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/extensions/extension_uninstall_dialog.h"
+#include "content/public/common/context_menu_params.h"
 #include "ui/base/models/simple_menu_model.h"
 
 class Browser;
 class ExtensionAction;
 class Profile;
 
 namespace extensions {
 class Extension;
+class ContextMenuMatcher;
+class MenuManager;
 }
 
 // The context menu model for extension icons.
 class ExtensionContextMenuModel
     : public base::RefCounted<ExtensionContextMenuModel>,
       public ui::SimpleMenuModel,
       public ui::SimpleMenuModel::Delegate,
       public extensions::ExtensionUninstallDialog::Delegate {
  public:
   enum MenuEntries {
     NAME = 0,
     CONFIGURE,
     HIDE,
     UNINSTALL,
     MANAGE,
     INSPECT_POPUP
   };
 
+  // Type of action the extension icon represents.
+  enum ActionType {
+    NO_ACTION = 0,
+    BROWSER_ACTION,
+    PAGE_ACTION
+  };
+
   // Delegate to handle showing an ExtensionAction popup.
   class PopupDelegate {
    public:
     // Called when the user selects the menu item which requests that the
     // popup be shown and inspected.
     virtual void InspectPopup(ExtensionAction* action) = 0;
 
    protected:
     virtual ~PopupDelegate() {}
   };
@@ skipping 26 matching lines @@
  private:
   friend class base::RefCounted<ExtensionContextMenuModel>;
   virtual ~ExtensionContextMenuModel();
 
   void InitMenu(const extensions::Extension* extension);
 
   // Gets the extension we are displaying the menu for. Returns NULL if the
   // extension has been uninstalled and no longer exists.
   const extensions::Extension* GetExtension() const;
 
+  // Appends the extension's context menu items.
+  void AppendExtensionItems();
+
+  // Determines whether this context menu was created for a browser action or
+  // a page action.
+  ActionType GetActionType(const extensions::Extension* extension);
+
   // A copy of the extension's id.
   std::string extension_id_;
 
   // The extension action of the extension we are displaying the menu for (if
   // it has one, otherwise NULL).
   ExtensionAction* extension_action_;
 
   Browser* browser_;
 
   Profile* profile_;
 
   // The delegate which handles the 'inspect popup' menu command (or NULL).
   PopupDelegate* delegate_;
 
+  ActionType action_type_;

[Devlin, 2014/07/02 17:25:21]

comment.

[gpdavis, 2014/07/03 01:46:58]

I'm not sure what to say about this that isn't explained in the comment for the
ActionType enum.  Should I add another comment here or move the enum comment
down?

[Devlin, 2014/07/07 20:20:57]

As a rule of thumb, the comment for the enum as a whole should be "This is the
type of data the enum can represent" and the variable should be "This is what
the enum means in this context".  So if the enum is "The type of extension
action an icon can have", the variable is "The type of extension action to which
this context menu is attached."  Sometimes its also useful to include a (very)
short reason why you need it, if it's not immediately clear, but that's pretty
much on a case-by-case basis.

[gpdavis, 2014/07/09 02:13:53]

Done.

+
+  content::ContextMenuParams params_;

[Devlin, 2014/07/02 17:25:21]

No need for this to be a member variable - you only use it once.

[gpdavis, 2014/07/03 01:46:58]

Done.

+
   // Keeps track of the extension uninstall dialog.
   scoped_ptr<extensions::ExtensionUninstallDialog> extension_uninstall_dialog_;
 
+  // Menu matcher for context menu items specified by the extension.
+  scoped_ptr<extensions::ContextMenuMatcher> extension_items_;
+
   DISALLOW_COPY_AND_ASSIGN(ExtensionContextMenuModel);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_CONTEXT_MENU_MODEL_H_