Declarative content scripts: Browser-side: per-extension shared memory regions (lazily loaded)

chrome/browser/extensions/extension_system_impl.h

Index: chrome/browser/extensions/extension_system_impl.h
diff --git a/chrome/browser/extensions/extension_system_impl.h b/chrome/browser/extensions/extension_system_impl.h
index df32495dae7cc1401ec9aba477cf8891ce9b1978..31eea889b52ff0043f2488a78bc3d37aaed8f8b4 100644
--- a/chrome/browser/extensions/extension_system_impl.h
+++ b/chrome/browser/extensions/extension_system_impl.h
@@ -13,11 +13,14 @@ class Profile;
 namespace extensions {
 
 class ContentVerifier;
+class DeclarativeUserScriptMaster;
 class ExtensionSystemSharedFactory;
 class ExtensionWarningBadgeService;
 class NavigationObserver;
+class SharedUserScriptMaster;
 class StandardManagementPolicyProvider;
 class StateStoreNotificationObserver;
+class UserScriptMasterManager;
 
 // The ExtensionSystem for ProfileImpl and OffTheRecordProfileImpl.
 // Implementation details: non-shared services are owned by
@@ -37,7 +40,8 @@ class ExtensionSystemImpl : public ExtensionSystem {
   virtual ExtensionService* extension_service() OVERRIDE;  // shared
   virtual RuntimeData* runtime_data() OVERRIDE;  // shared
   virtual ManagementPolicy* management_policy() OVERRIDE;  // shared
-  virtual UserScriptMaster* user_script_master() OVERRIDE;  // shared
+  virtual SharedUserScriptMaster* shared_user_script_master() OVERRIDE;
+  // ^--- shared

[Devlin, 2014/08/04 18:33:24]

Let's just move this above the sharedUserScriptMaster line. :)

[Mark Dittmer, 2014/08/05 20:33:18]

Done.

   virtual ProcessManager* process_manager() OVERRIDE;
   virtual StateStore* state_store() OVERRIDE;  // shared
   virtual StateStore* rules_store() OVERRIDE;  // shared
@@ -63,6 +67,10 @@ class ExtensionSystemImpl : public ExtensionSystem {
   virtual scoped_ptr<ExtensionSet> GetDependentExtensions(
       const Extension* extension) OVERRIDE;
 
+  virtual DeclarativeUserScriptMaster*
+      GetDeclarativeUserScriptMasterByExtension(
+          const ExtensionId& extension_id) OVERRIDE;
+
  private:
   friend class ExtensionSystemSharedFactory;
 
@@ -87,7 +95,7 @@ class ExtensionSystemImpl : public ExtensionSystem {
     ExtensionService* extension_service();
     RuntimeData* runtime_data();
     ManagementPolicy* management_policy();
-    UserScriptMaster* user_script_master();
+    SharedUserScriptMaster* shared_user_script_master();
     Blacklist* blacklist();
     InfoMap* info_map();
     LazyBackgroundTaskQueue* lazy_background_task_queue();
@@ -99,6 +107,9 @@ class ExtensionSystemImpl : public ExtensionSystem {
     const OneShotEvent& ready() const { return ready_; }
     ContentVerifier* content_verifier();
 
+    DeclarativeUserScriptMaster* GetDeclarativeUserScriptMasterByExtension(
+        const ExtensionId& extension_id);
+
    private:
     Profile* profile_;
 
@@ -113,7 +124,7 @@ class ExtensionSystemImpl : public ExtensionSystem {
     scoped_ptr<LazyBackgroundTaskQueue> lazy_background_task_queue_;
     scoped_ptr<EventRouter> event_router_;
     scoped_ptr<NavigationObserver> navigation_observer_;
-    scoped_ptr<UserScriptMaster> user_script_master_;
+    scoped_ptr<UserScriptMasterManager> user_script_master_manager_;
     scoped_ptr<Blacklist> blacklist_;
     // StandardManagementPolicyProvider depends on Blacklist.
     scoped_ptr<StandardManagementPolicyProvider>