Extend contextMenus API to support browser/page actions

chrome/browser/extensions/context_menu_matcher.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_CONTEXT_MENU_MATCHER_H_
 #define CHROME_BROWSER_EXTENSIONS_CONTEXT_MENU_MATCHER_H_
 
 #include <map>
 
 #include "base/callback.h"
@@ skipping 16 matching lines @@
   // The |filter| will be called on possibly matching menu items, and its
   // result is used to determine which items to actually append to the menu.
   ContextMenuMatcher(Profile* profile,
                      ui::SimpleMenuModel::Delegate* delegate,
                      ui::SimpleMenuModel* menu_model,
                      const base::Callback<bool(const MenuItem*)>& filter);
 
   // 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.
+  // Appends items with the extension's icon.
   void AppendExtensionItems(const MenuItem::ExtensionKey& extension_key,
                             const base::string16& selection_text,
                             int* index);
 
+  // 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.
+  // Appends items without the extension's icon.
+  void AppendExtensionItemsWithoutIcons(

[Devlin, 2014/07/15 17:37:54]

I know we did this in the other patch for ExtensionService, but this method is
only called four times in three files (and we're already touching some of them,
anyway).  Let's just add the bool param directly to AppendExtensionItems.

[gpdavis, 2014/07/15 19:46:07]

Done.

+      const MenuItem::ExtensionKey& extension_key,
+      const base::string16& selection_text,
+      int* index);
+
   void Clear();
 
   // This function returns the top level context menu title of an extension
   // based on a printable selection text.
   base::string16 GetTopLevelContextMenuTitle(
       const MenuItem::ExtensionKey& extension_key,
       const base::string16& selection_text);
 
   bool IsCommandIdChecked(int command_id) const;
   bool IsCommandIdEnabled(int command_id) const;
   void ExecuteCommand(int command_id,
                       content::WebContents* web_contents,
                       const content::ContextMenuParams& params);
 
  private:
   friend class ::ExtensionContextMenuBrowserTest;
 
+  // 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. |include_icons| is used to determine whether
+  // the extension's icon should be included with the items.
+  void AppendExtensionItemsImpl(const MenuItem::ExtensionKey& extension_key,
+                                const base::string16& selection_text,
+                                int* index,
+                                bool include_icons);
+
   bool GetRelevantExtensionTopLevelItems(
       const MenuItem::ExtensionKey& extension_key,
       const Extension** extension,
       bool* can_cross_incognito,
       MenuItem::List& items);
 
   MenuItem::List GetRelevantExtensionItems(
       const MenuItem::List& items,
       bool can_cross_incognito);
 
@@ skipping 21 matching lines @@
 
   // Keep track of and clean up menu models for submenus.
   ScopedVector<ui::SimpleMenuModel> extension_menu_models_;
 
   DISALLOW_COPY_AND_ASSIGN(ContextMenuMatcher);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_CONTEXT_MENU_MATCHER_H_