chrome/browser/extensions/api/declarative/rules_registry_service.cc - Issue 590573002: Remove ContentRulesRegistry dependence from RulesRegistryService.

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_service.cc

Issue 590573002: Remove ContentRulesRegistry dependence from RulesRegistryService. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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

« no previous file with comments | « chrome/browser/extensions/api/chrome_extensions_api_client.cc ('k') | extensions/browser/api/extensions_api_client.h » ('j') | extensions/browser/api/extensions_api_client.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index ac1c824dfa43a75e94fbe9eeea3353fc200645f5..9c13c262d05e7c95be947855c71e9c016adfc19f 100644

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

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

@@ -8,7 +8,6 @@

#include "base/lazy_instance.h"

#include "base/logging.h"

#include "base/memory/scoped_ptr.h"

-#include "chrome/browser/extensions/api/declarative_content/content_rules_registry.h"

#include "chrome/browser/extensions/api/web_request/web_request_api.h"

#include "content/public/browser/browser_thread.h"

#include "content/public/browser/notification_details.h"

@@ -19,6 +18,7 @@

#include "extensions/browser/api/declarative/rules_cache_delegate.h"

#include "extensions/browser/api/declarative_webrequest/webrequest_constants.h"

#include "extensions/browser/api/declarative_webrequest/webrequest_rules_registry.h"

+#include "extensions/browser/api/extensions_api_client.h"

#include "extensions/browser/extension_registry.h"

#include "extensions/common/extension.h"

@@ -91,11 +91,13 @@ void RulesRegistryService::EnsureDefaultRulesRegistriesRegistered(

RulesCacheDelegate* content_rules_cache_delegate =

new RulesCacheDelegate(false /*log_storage_init_delay*/);

cache_delegates_.push_back(content_rules_cache_delegate);

- scoped_refptr<ContentRulesRegistry> content_rules_registry(

- new ContentRulesRegistry(browser_context_,

- content_rules_cache_delegate));

+ scoped_refptr<RulesRegistry> content_rules_registry =

+ ExtensionsAPIClient::Get()->GetContentRulesRegistry(

+ browser_context_, content_rules_cache_delegate);

RegisterRulesRegistry(content_rules_registry);

- content_rules_registry_ = content_rules_registry.get();

+ content_rules_registry_ =

+ ExtensionsAPIClient::Get()->ConvertToContentRulesRegistryPtr(

+ content_rules_registry.get());

}