chrome/browser/extensions/api/declarative/rules_registry_with_cache.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/declarative/rules_registry_with_cache.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/automation/testing_automation_provider.cc ('k') | chrome/browser/extensions/api/developer_private/developer_private_api.cc » ('j') | chrome/browser/extensions/extension_prefs.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index e285eb761e0a21b3324e1cf94d4d9b49a8cb281f..a452130fb03c26eacd4b2a2c1590c28fdd0c1538 100644

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

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

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

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

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

#include "chrome/common/extensions/extension.h"

@@ -402,7 +403,7 @@ RulesRegistryWithCache::RuleStorageOnUI::ReadRulesForInstalledExtensions() {

(*i)->HasAPIPermission(APIPermission::kDeclarativeWebRequest);

bool respects_off_the_record =

!(profile_->IsOffTheRecord()) ||

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

+ extension_util::IsIncognitoEnabled((*i)->id(), extension_service);

if (needs_apis_storing_rules && respects_off_the_record)

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

}