chrome/browser/extensions/api/declarative_content/content_rules_registry.cc - Issue 344433003: Prepare declarativeContent API for new script injection feature. Added Javascript types and functio…

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_content/content_rules_registry.cc

Issue 344433003: Prepare declarativeContent API for new script injection feature. Added Javascript types and functio… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Clean up declarative_content.json and store RequestContentScript data in action object Created 6 years, 5 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

« chrome/browser/extensions/api/declarative_content/content_action.cc ('K') | « chrome/browser/extensions/api/declarative_content/content_rules_registry.h ('k') | chrome/browser/extensions/api/declarative_content/content_rules_registry_unittest.cc » ('j') | extensions/renderer/content_watcher.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/declarative_content/content_rules_registry.cc

diff --git a/chrome/browser/extensions/api/declarative_content/content_rules_registry.cc b/chrome/browser/extensions/api/declarative_content/content_rules_registry.cc

index 7b379c1a67f2eeade2c708a517bd25de1713f5a7..203b984846a1eada9f775195d5b394b9b376f9dd 100644

--- a/chrome/browser/extensions/api/declarative_content/content_rules_registry.cc

+++ b/chrome/browser/extensions/api/declarative_content/content_rules_registry.cc

@@ -24,9 +24,10 @@ using url_matcher::URLMatcherConditionSet;

namespace extensions {

ContentRulesRegistry::ContentRulesRegistry(Profile* profile,

+ const std::string& event_name,

RulesCacheDelegate* cache_delegate)

: RulesRegistry(profile,

- declarative_content_constants::kOnPageChanged,

+ event_name,

content::BrowserThread::UI,

cache_delegate,

WebViewKey(0, 0)) {

@@ -300,7 +301,8 @@ void ContentRulesRegistry::UpdateConditionCache() {

void ContentRulesRegistry::InstructRenderProcess(

content::RenderProcessHost* process) {

- process->Send(new ExtensionMsg_WatchPages(watched_css_selectors_));

+ process->Send(

+ new ExtensionMsg_WatchPages(event_name(), watched_css_selectors_));

}

bool ContentRulesRegistry::IsEmpty() const {