chrome/browser/extensions/context_menu_matcher.cc - Issue 25366003: Moved some functions off ExtensionService into a new file extension_util.

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 25366003: Moved some functions off ExtensionService into a new file extension_util. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Windows compile Created 7 years, 2 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

« no previous file with comments | « chrome/browser/extensions/api/tabs/windows_event_router.cc ('k') | chrome/browser/extensions/event_router.cc » ('j') | chrome/browser/extensions/extension_prefs.h » ('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 950461d4d05ff41e8a8f50cd4d32e90dd3fc0e18..c125660b093e2f1320d286ea258ffca3b1f593ff 100644

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

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

@@ -7,6 +7,7 @@

#include "chrome/browser/extensions/context_menu_matcher.h"

#include "chrome/browser/extensions/extension_service.h"

#include "chrome/browser/extensions/extension_system.h"

+#include "chrome/browser/extensions/extension_util.h"

#include "chrome/browser/profiles/profile.h"

#include "content/public/common/context_menu_params.h"

#include "ui/gfx/favicon_size.h"

@@ -161,7 +162,7 @@ bool ContextMenuMatcher::GetRelevantExtensionTopLevelItems(

if (!all_items || all_items->empty())

return false;

- *can_cross_incognito = service->CanCrossIncognito(*extension);

+ *can_cross_incognito = extension_util::CanCrossIncognito(*extension, service);

items = GetRelevantExtensionItems(*all_items,

*can_cross_incognito);