chrome/browser/extensions/api/declarative/rules_registry_service.cc - Issue 49693003: Refactor RulesRegistryWithCache to RulesRegistry

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 49693003: Refactor RulesRegistryWithCache to RulesRegistry (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Addressed nits 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/declarative/rules_registry_service.h ('k') | chrome/browser/extensions/api/declarative/rules_registry_with_cache.h » ('j') | no next file with comments »
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 0803631c7ebbb5223fd5d0dd1334ed0907ab15fa..fd2a4abceb1f8a4d70038a531d74a3c90f5be585 100644

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

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

@@ -9,7 +9,7 @@

#include "base/logging.h"

#include "base/memory/scoped_ptr.h"

#include "chrome/browser/chrome_notification_types.h"

-#include "chrome/browser/extensions/api/declarative/initializing_rules_registry.h"

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

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

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

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

@@ -45,7 +45,7 @@ RulesRegistryService::RulesRegistryService(Profile* profile)

RulesRegistryService::~RulesRegistryService() {}

void RulesRegistryService::RegisterDefaultRulesRegistries() {

- scoped_ptr<RulesRegistryWithCache::RuleStorageOnUI> ui_part;

+ scoped_ptr<RulesCacheDelegate> ui_part;

scoped_refptr<WebRequestRulesRegistry> web_request_rules_registry(

new WebRequestRulesRegistry(profile_, &ui_part));

ui_parts_of_registries_.push_back(ui_part.release());

@@ -98,8 +98,7 @@ void RulesRegistryService::RegisterRulesRegistry(

scoped_refptr<RulesRegistry> rule_registry) {

const std::string event_name(rule_registry->event_name());

DCHECK(rule_registries_.find(event_name) == rule_registries_.end());

- rule_registries_[event_name] =

- make_scoped_refptr(new InitializingRulesRegistry(rule_registry));

+ rule_registries_[event_name] = rule_registry;

}

scoped_refptr<RulesRegistry> RulesRegistryService::GetRulesRegistry(