extensions/browser/api/declarative/rules_registry_service.cc - Issue 596003002: Allow declarative webrequest and webrequest in extensions.

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: extensions/browser/api/declarative/rules_registry_service.cc

Issue 596003002: Allow declarative webrequest and webrequest in extensions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Small changes are made accoding to Ken's comments. Created 6 years, 3 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

« extensions/browser/api/declarative/declarative_api.cc ('K') | « extensions/browser/api/declarative/declarative_api.cc ('k') | extensions/browser/api/extensions_api_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/browser/api/declarative/rules_registry_service.cc

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

index 12df0135a3122468affc88ae27c61b99954f91e9..9ddc450d66727494e544197ea28ad9a0ecc2e281 100644

--- a/extensions/browser/api/declarative/rules_registry_service.cc

+++ b/extensions/browser/api/declarative/rules_registry_service.cc

@@ -95,8 +95,10 @@ void RulesRegistryService::EnsureDefaultRulesRegistriesRegistered(

scoped_refptr<ContentRulesRegistry> content_rules_registry =

ExtensionsAPIClient::Get()->CreateContentRulesRegistry(

browser_context_, content_rules_cache_delegate);

- RegisterRulesRegistry(content_rules_registry);

- content_rules_registry_ = content_rules_registry.get();

+ if (content_rules_registry.get() != nullptr) {

+ RegisterRulesRegistry(content_rules_registry);

+ content_rules_registry_ = content_rules_registry.get();

+ }

}