Extend contextMenus API to support browser/page actions

chrome/browser/extensions/context_menu_matcher.h

Index: chrome/browser/extensions/context_menu_matcher.h
diff --git a/chrome/browser/extensions/context_menu_matcher.h b/chrome/browser/extensions/context_menu_matcher.h
index f3f631fc9181eba56f0cee0fb596fec505da4ee7..4726305a9977576a4cd4a71a2d6e959509b4306f 100644
--- a/chrome/browser/extensions/context_menu_matcher.h
+++ b/chrome/browser/extensions/context_menu_matcher.h
@@ -14,6 +14,7 @@
 #include "ui/base/models/simple_menu_model.h"
 
 class ExtensionContextMenuBrowserTest;
+class Profile;

[Devlin, 2014/07/30 21:32:57]

Don't need this.

[gpdavis, 2014/07/31 23:11:28]

Done.

 
 namespace content {
 class BrowserContext;
@@ -43,10 +44,13 @@ class ContextMenuMatcher {
 
   // This is a helper function to append items for one particular extension.
   // The |index| parameter is used for assigning id's, and is incremented for
-  // each item actually added.
+  // each item actually added. |is_action_menu| is used for browser and page
+  // action context menus, in which menu items are not placed in submenus
+  // and the extension's icon is not shown.
   void AppendExtensionItems(const MenuItem::ExtensionKey& extension_key,
                             const base::string16& selection_text,
-                            int* index);
+                            int* index,
+                            bool is_action_menu);
 
   void Clear();
 
@@ -80,7 +84,8 @@ class ContextMenuMatcher {
                                        bool can_cross_incognito,
                                        const base::string16& selection_text,
                                        ui::SimpleMenuModel* menu_model,
-                                       int* index);
+                                       int* index,
+                                       bool is_action_menu_top_level);
 
   // Attempts to get an MenuItem given the id of a context menu item.
   extensions::MenuItem* GetExtensionMenuItem(int id) const;