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

chrome/browser/extensions/tab_helper.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/tab_helper.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 232 matching lines @@
 void TabHelper::RenderViewCreated(RenderViewHost* render_view_host) {
   SetTabId(render_view_host);
 }
 
 void TabHelper::DidNavigateMainFrame(
     const content::LoadCommittedDetails& details,
     const content::FrameNavigateParams& params) {
 #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)
 
   content::BrowserContext* context = web_contents()->GetBrowserContext();
   ExtensionRegistry* registry = ExtensionRegistry::Get(context);
   const ExtensionSet& enabled_extensions = registry->enabled_extensions();
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableStreamlinedHostedApps)) {
 #if !defined(OS_ANDROID)
@@ skipping 189 matching lines @@
     int32 on_page_id,
     const GURL& on_url) {
   FOR_EACH_OBSERVER(ScriptExecutionObserver, script_execution_observers_,
                     OnScriptsExecuted(web_contents(),
                                       executing_scripts_map,
                                       on_page_id,
                                       on_url));
 }
 
 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)
 }
 
 void TabHelper::OnDetailedConsoleMessageAdded(
     const base::string16& message,
     const base::string16& source,
     const StackTrace& stack_trace,
     int32 severity_level) {
 #if defined(ENABLE_EXTENSIONS)
@@ skipping 114 matching lines @@
   }
 }
 
 void TabHelper::SetTabId(RenderViewHost* render_view_host) {
   render_view_host->Send(
       new ExtensionMsg_SetTabId(render_view_host->GetRoutingID(),
                                 SessionID::IdForTab(web_contents())));
 }
 
 }  // namespace extensions