chrome/browser/extensions/event_router.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/event_router.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/context_menu_matcher.cc ('k') | chrome/browser/extensions/extension_browsertest.cc » ('j') | chrome/browser/extensions/extension_prefs.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/event_router.cc

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

index b547a33b77bec7043c5e8f1abe907b870f6d655c..b5e88bf4e10280250b1ef46aa67c6c91af87e4a6 100644

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

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

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

#include "chrome/browser/extensions/extension_process_manager.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/extensions/lazy_background_task_queue.h"

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

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

@@ -631,9 +632,9 @@ bool EventRouter::CanDispatchEventToProfile(Profile* profile,

// incognito tab event sent to a normal process, or vice versa).

bool cross_incognito =

event->restrict_to_profile && profile != event->restrict_to_profile;

- if (cross_incognito &&

- !ExtensionSystem::Get(profile)->extension_service()->

- CanCrossIncognito(extension)) {

+ if (cross_incognito && !extension_util::CanCrossIncognito(

+ extension,

+ ExtensionSystem::Get(profile)->extension_service())) {

return false;

}