Prepare declarativeContent API for new script injection feature. Added Javascript types and functio…

chrome/browser/extensions/tab_helper.cc

Index: chrome/browser/extensions/tab_helper.cc
diff --git a/chrome/browser/extensions/tab_helper.cc b/chrome/browser/extensions/tab_helper.cc
index bc51f17378051425d25055f3f041185f4fbee937..72168bc135c333aef324aef7c419ed9a58f2b353 100644
--- a/chrome/browser/extensions/tab_helper.cc
+++ b/chrome/browser/extensions/tab_helper.cc
@@ -250,8 +250,15 @@ void TabHelper::DidNavigateMainFrame(
 #if defined(ENABLE_EXTENSIONS)
   if (ExtensionSystem::Get(profile_)->extension_service() &&
       RulesRegistryService::Get(profile_)) {
-    RulesRegistryService::Get(profile_)->content_rules_registry()->
-        DidNavigateMainFrame(web_contents(), details, params);
+    ContentRulesRegistryMap& content_rules_registry_map =
+        RulesRegistryService::Get(profile_)->content_rules_registry_map();
+    for (ContentRulesRegistryMap::iterator it =
+             content_rules_registry_map.begin();
+         it != content_rules_registry_map.end(); ++it) {
+      it->second->DidNavigateMainFrame(web_contents(),

[Fady Samuel, 2014/06/23 18:56:28]

This seems a bit weird. It seems like it breaks encapsulation. Perhaps you can
move this code into RulesRegistryService?

[Mark Dittmer, 2014/06/24 14:14:19]

That would be nice. RulesRegistryService already has a notification system
(namely, NotifyRegistriesHelper), but it only supports passing the extension ID.
Is this special case really important enough to implement a DidNavigateMainFrame
at the registry service level?

+                                       details,
+                                       params);
+    }
   }
 #endif  // defined(ENABLE_EXTENSIONS)
 
@@ -461,12 +468,18 @@ void TabHelper::OnContentScriptsExecuting(
 }
 
 void TabHelper::OnWatchedPageChange(
+    const std::string& event_name,
     const std::vector<std::string>& css_selectors) {
 #if defined(ENABLE_EXTENSIONS)
   if (ExtensionSystem::Get(profile_)->extension_service() &&
       RulesRegistryService::Get(profile_)) {
-    RulesRegistryService::Get(profile_)->content_rules_registry()->Apply(
-        web_contents(), css_selectors);
+    ContentRulesRegistry* content_rules_registry =
+        RulesRegistryService::Get(profile_)->
+        GetContentRulesRegistry(event_name);
+    if (!content_rules_registry)
+      return;
+
+    content_rules_registry->Apply(web_contents(), css_selectors);
   }
 #endif  // defined(ENABLE_EXTENSIONS)
 }