chrome/browser/extensions/context_menu_matcher.cc - Issue 359493005: Extend contextMenus API to support browser/page actions

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/context_menu_matcher.cc

Issue 359493005: Extend contextMenus API to support browser/page actions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Removed AppendExtensionItemsImpl, minor cleanup, comments Created 6 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/extensions/context_menu_matcher.h ('K') | « chrome/browser/extensions/context_menu_matcher.h ('k') | chrome/browser/extensions/extension_context_menu_model.h » ('j') | chrome/browser/extensions/extension_context_menu_model.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/context_menu_matcher.cc

diff --git a/chrome/browser/extensions/context_menu_matcher.cc b/chrome/browser/extensions/context_menu_matcher.cc

index 0e7adbddbdfc61208f56cfd0c7d2a7e67421d05e..fee3326fbae928401a31811e6b6935e007545585 100644

--- a/chrome/browser/extensions/context_menu_matcher.cc

+++ b/chrome/browser/extensions/context_menu_matcher.cc

@@ -30,7 +30,8 @@ ContextMenuMatcher::ContextMenuMatcher(

void ContextMenuMatcher::AppendExtensionItems(

const MenuItem::ExtensionKey& extension_key,

const base::string16& selection_text,

- int* index) {

+ int* index,

+ bool include_icons) {

DCHECK_GE(*index, 0);

int max_index =

IDC_EXTENSIONS_CONTEXT_CUSTOM_LAST - IDC_EXTENSIONS_CONTEXT_CUSTOM_FIRST;

@@ -86,7 +87,8 @@ void ContextMenuMatcher::AppendExtensionItems(

RecursivelyAppendExtensionItems(submenu_items, can_cross_incognito,

selection_text, submenu, index);

}

- SetExtensionIcon(extension_key.extension_id);

+ if (include_icons)

+ SetExtensionIcon(extension_key.extension_id);

}