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

chrome/browser/extensions/api/declarative_content/content_rules_registry.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/api/declarative_content/content_rules_registry.h"
 
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/api/declarative_content/content_action.h"
 #include "chrome/browser/extensions/api/declarative_content/content_condition.h"
 #include "chrome/browser/extensions/api/declarative_content/content_constants.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/extension_messages.h"
 
 using url_matcher::URLMatcherConditionSet;
 
 namespace extensions {
 
 ContentRulesRegistry::ContentRulesRegistry(Profile* profile,
+                                           const std::string& event_name,
+                                           const WatchedPagesRecipient
+                                           watched_pages_recipient,
                                            RulesCacheDelegate* cache_delegate)
     : RulesRegistry(profile,
-                    declarative_content_constants::kOnPageChanged,
+                    event_name,
                     content::BrowserThread::UI,
                     cache_delegate,
-                    WebViewKey(0, 0)) {
+                    WebViewKey(0, 0)),
+      watched_pages_recipient_(watched_pages_recipient) {
   extension_info_map_ = ExtensionSystem::Get(profile)->info_map();
 
   registrar_.Add(this, content::NOTIFICATION_RENDERER_PROCESS_CREATED,
                  content::NotificationService::AllBrowserContextsAndSources());
   registrar_.Add(this, content::NOTIFICATION_WEB_CONTENTS_DESTROYED,
                  content::NotificationService::AllBrowserContextsAndSources());
 }
 
 void ContentRulesRegistry::Observe(
     int type,
@@ skipping 250 matching lines @@
          !it.IsAtEnd(); it.Advance()) {
       content::RenderProcessHost* process = it.GetCurrentValue();
       if (process->GetBrowserContext() == profile())
         InstructRenderProcess(process);
     }
   }
 }
 
 void ContentRulesRegistry::InstructRenderProcess(
     content::RenderProcessHost* process) {
-  process->Send(new ExtensionMsg_WatchPages(watched_css_selectors_));
+  for (std::vector<std::string>::const_iterator it =
+           watched_css_selectors_.begin();
+       it != watched_css_selectors_.end(); ++it) {

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

This is a do-nothing for loop? WhY?

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

I couldn't tell you. Probably left over from some experimental refactoring of
the IPC workflow.

Got rid of it.

+  }
+  process->Send(
+      new ExtensionMsg_WatchPages(event_name(),
+                                  watched_pages_recipient_,
+                                  watched_css_selectors_));
 }
 
 bool ContentRulesRegistry::IsEmpty() const {
   return match_id_to_rule_.empty() && content_rules_.empty() &&
       url_matcher_.IsEmpty();
 }
 
 ContentRulesRegistry::~ContentRulesRegistry() {}
 
 base::Time ContentRulesRegistry::GetExtensionInstallationTime(
     const std::string& extension_id) const {
   if (!extension_info_map_.get())  // May be NULL during testing.
     return base::Time();
 
   return extension_info_map_->GetInstallTime(extension_id);
 }
 
 }  // namespace extensions