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 "ui/base/models/simple_menu_model.h"
 
 class Browser;
 class ExtensionAction;
 class Profile;
 
 namespace extensions {
 class Extension;
+class ContextMenuMatcher;
 }
 
 // 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.

[Devlin, 2014/07/09 20:07:47]

Do these actually need to be public?

[gpdavis, 2014/07/09 22:15:50]

They are necessary for MenuItemMatchesExtension, which is anonymous.  Should I
keep it the way it is, or make this private and move MenuItemMatchesExtension
into the class?

[Devlin, 2014/07/09 22:42:58]

Ah, that's right.  Let's just leave it as-is for now.

[gpdavis, 2014/07/10 00:22:25]

Acknowledged.

+  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);

[Devlin, 2014/07/09 20:07:47]

Does this still exist?

[gpdavis, 2014/07/09 22:15:50]

No, no it does not.  Sorry about all the dead code; I need to pay more attention
when I'm removing things that I've added.

+
   // 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_;
 
+  // The type of extension action to which this context menu is attached.
+  ActionType action_type_;
+
   // 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_