chrome/browser/extensions/api/declarative/rules_registry_storage_delegate.cc - Issue 11547033: Implement declarativeContent API.

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/declarative/rules_registry_storage_delegate.cc

Issue 11547033: Implement declarativeContent API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years 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/api/declarative/declarative_rule.h ('K') | « chrome/browser/extensions/api/declarative/rules_registry_service.cc ('k') | chrome/browser/extensions/api/declarative_content/OWNERS » ('j') | chrome/browser/extensions/api/declarative_content/content_rules_registry.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/declarative/rules_registry_storage_delegate.cc

diff --git a/chrome/browser/extensions/api/declarative/rules_registry_storage_delegate.cc b/chrome/browser/extensions/api/declarative/rules_registry_storage_delegate.cc

index f256a9cf03008a3e34c18d5ba6d316cfea0a0343..ed6f0468ec6d2fdf4f6d6dd5ead9be9b69dcd2ea 100644

--- a/chrome/browser/extensions/api/declarative/rules_registry_storage_delegate.cc

+++ b/chrome/browser/extensions/api/declarative/rules_registry_storage_delegate.cc

@@ -194,7 +194,8 @@ void RulesRegistryStorageDelegate::Inner::InitForOTRProfile() {

const ExtensionSet* extensions = extension_service->extensions();

for (ExtensionSet::const_iterator i = extensions->begin();

i != extensions->end(); ++i) {

- if ((*i)->HasAPIPermission(APIPermission::kDeclarativeWebRequest) &&

+ if (((*i)->HasAPIPermission(APIPermission::kDeclarativeContent) ||

+ (*i)->HasAPIPermission(APIPermission::kDeclarativeWebRequest)) &&

extension_service->IsIncognitoEnabled((*i)->id()))

ReadFromStorage((*i)->id());

}

@@ -211,8 +212,8 @@ void RulesRegistryStorageDelegate::Inner::Observe(

content::Details<const extensions::Extension>(details).ptr();

// TODO(mpcomplete): This API check should generalize to any use of

// declarative rules, not just webRequest.

- if (extension->HasAPIPermission(

- APIPermission::kDeclarativeWebRequest)) {

+ if (extension->HasAPIPermission(APIPermission::kDeclarativeContent) ||

+ extension->HasAPIPermission(APIPermission::kDeclarativeWebRequest)) {

ExtensionInfoMap* extension_info_map =

ExtensionSystem::Get(profile_)->info_map();

if (profile_->IsOffTheRecord() &&