chrome/browser/extensions/api/messaging/message_service.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/api/messaging/message_service.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/media_galleries_private/media_galleries_private_api.cc ('k') | chrome/browser/extensions/api/module/module.cc » ('j') | chrome/browser/extensions/extension_prefs.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/messaging/message_service.cc

diff --git a/chrome/browser/extensions/api/messaging/message_service.cc b/chrome/browser/extensions/api/messaging/message_service.cc

index cd29d9805181528bc514ad6e24888fa75d0aed98..41012219fdae52b6b82eb841da71518fecee7fc7 100644

--- a/chrome/browser/extensions/api/messaging/message_service.cc

+++ b/chrome/browser/extensions/api/messaging/message_service.cc

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

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

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

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

@@ -206,7 +207,8 @@ void MessageService::OpenChannelToExtension(

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

if (profile->IsOffTheRecord() &&

- !extension_service->IsIncognitoEnabled(target_extension_id)) {

+ !extension_util::IsIncognitoEnabled(target_extension_id,

+ extension_service)) {

// Allow the security token apps (normal, dev) to be connectable from

// incognito profiles. See http://crbug.com/295845.

std::set<std::string> incognito_whitelist;