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

chrome/browser/extensions/api/declarative_content/content_rules_registry.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_API_DECLARATIVE_CONTENT_CONTENT_RULES_REGISTRY_H_
 #define CHROME_BROWSER_EXTENSIONS_API_DECLARATIVE_CONTENT_CONTENT_RULES_REGISTRY_H_
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "chrome/browser/extensions/api/declarative/declarative_rule.h"
 #include "chrome/browser/extensions/api/declarative/rules_registry.h"
 #include "chrome/browser/extensions/api/declarative_content/content_action.h"
 #include "chrome/browser/extensions/api/declarative_content/content_condition.h"
 #include "components/url_matcher/url_matcher.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "extensions/browser/info_map.h"
+#include "extensions/common/watched_pages_recipient.h"
 
 class Profile;
 class ContentPermissions;
 
 namespace content {
 class RenderProcessHost;
 class WebContents;
 struct FrameNavigateParams;
 struct LoadCommittedDetails;
 }
@@ skipping 22 matching lines @@
 // ContentRuleActions.
 //
 // The evaluation of URL related condition attributes (host_suffix, path_prefix)
 // is delegated to a URLMatcher, because this is capable of evaluating many
 // of such URL related condition attributes in parallel.
 class ContentRulesRegistry : public RulesRegistry,
                              public content::NotificationObserver {
  public:
   // For testing, |ui_part| can be NULL. In that case it constructs the
   // registry with storage functionality suspended.
-  ContentRulesRegistry(Profile* profile, RulesCacheDelegate* cache_delegate);
+  ContentRulesRegistry(Profile* profile,
+                       const std::string& event_name,
+                       const WatchedPagesRecipient watched_pages_recipient,

[Jeffrey Yasskin, 2014/06/27 22:03:41]

Either use const WatchedPagesRecipient& or just WatchedPagesRecipient in the
header file. You can still make it a const value in the .cc file.

[Mark Dittmer, 2014/06/30 12:34:02]

Done.

+                       RulesCacheDelegate* cache_delegate);
 
   // Applies all content rules given an update (CSS match change or
   // page navigation, for now) from the renderer.
   void Apply(content::WebContents* contents,
              const std::vector<std::string>& matching_css_selectors);
 
   // Applies all content rules given that a tab was just navigated.
   void DidNavigateMainFrame(content::WebContents* tab,
                             const content::LoadCommittedDetails& details,
                             const content::FrameNavigateParams& params);
@@ skipping 52 matching lines @@
   // Maps tab_id to the set of rules that match on that tab.  This
   // lets us call Revert as appropriate.
   std::map<int, std::set<ContentRule*> > active_rules_;
 
   // Matches URLs for the page_url condition.
   url_matcher::URLMatcher url_matcher_;
 
   // All CSS selectors any rule's conditions watch for.
   std::vector<std::string> watched_css_selectors_;
 
+  WatchedPagesRecipient watched_pages_recipient_;
+
   // Manages our notification registrations.
   content::NotificationRegistrar registrar_;
 
   scoped_refptr<InfoMap> extension_info_map_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentRulesRegistry);
 };
 
+// Map from event_name to registry pointer.
+typedef std::map<std::string, ContentRulesRegistry*> ContentRulesRegistryMap;

[Jeffrey Yasskin, 2014/06/27 22:03:41]

Generally avoid typedefs like this, since they make it harder to tell what's
being mapped at the point they're actually used.

[Mark Dittmer, 2014/06/30 12:34:02]

Done. Still use typedef within method in another context where typename is
required multiple times.

+
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_DECLARATIVE_CONTENT_CONTENT_RULES_REGISTRY_H_