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;
+class ExtensionContextMenuModelTest;
 }
 
 // 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 18 matching lines @@
       int command_id,
       ui::Accelerator* accelerator) OVERRIDE;
   virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE;
 
   // ExtensionUninstallDialog::Delegate:
   virtual void ExtensionUninstallAccepted() OVERRIDE;
   virtual void ExtensionUninstallCanceled() OVERRIDE;
 
  private:
   friend class base::RefCounted<ExtensionContextMenuModel>;
+  friend class extensions::ExtensionContextMenuModelTest;
+
   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();
+
   // 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_;
+
+  // Number of extension items in this menu. Used for testing.
+  int extension_items_count_ = 0;

[Devlin, 2014/07/24 21:51:27]

Don't initialize values in the class definition like this...

[gpdavis, 2014/07/28 21:08:22]

My mistake.  I did this because the Google C++ style guide says it's okay to do
for simple initializations (especially when it is intialized to the same value
in multiple constructors, as is the case).  No good?

http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml?showone=Initia...

+
   DISALLOW_COPY_AND_ASSIGN(ExtensionContextMenuModel);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_CONTEXT_MENU_MODEL_H_