Renderer changes for wiring up shared memory with declarative injection

extensions/renderer/user_script_set_manager.h

 // Copyright 2014 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 EXTENSIONS_RENDERER_USER_SCRIPT_SET_MANAGER_H_
 #define EXTENSIONS_RENDERER_USER_SCRIPT_SET_MANAGER_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 38 matching lines @@
         const std::vector<UserScript*>& scripts) = 0;
   };
 
   UserScriptSetManager(const ExtensionSet* extensions);
 
   virtual ~UserScriptSetManager();
 
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 
-  const UserScriptSet* GetProgrammaticScriptsByExtension(
-      const ExtensionId& extensionId);
+  scoped_ptr<ScriptInjection> GetInjectionForScript(

[Devlin, 2014/08/21 17:06:17]

comments

+      int64 script_id,
+      blink::WebFrame* web_frame,
+      int tab_id,
+      UserScript::RunLocation run_location,
+      const GURL& url,
+      const Extension* extension);
 
   // Put all injections from |static_scripts| and each of
   // |programmatic_scripts_| into |injections|.
   void GetAllInjections(ScopedVector<ScriptInjection>* injections,
                         blink::WebFrame* web_frame,
                         int tab_id,
                         UserScript::RunLocation run_location);
 
   // Get active extension IDs from |static_scripts| and each of
   // |programmatic_scripts_|.
   void GetAllActiveExtensionIds(std::set<std::string>* ids) const;
 
   const UserScriptSet* static_scripts() const { return &static_scripts_; }
 
  private:
+  // A RenderViewObserver implementation which watches the various render views

[Devlin, 2014/08/21 17:06:17]

Why?

[Mark Dittmer, 2014/08/23 12:21:39]

More leftovers from a failed/unnecessary pattern I tried. Removed.

+  // in order to notify the ScriptInjectionManager of different document load
+  // states.
+  class RVOHelper;
+
   // Map for per-extension sets that may be defined programmatically.
   typedef std::map<ExtensionId, linked_ptr<UserScriptSet> > UserScriptSetMap;
 
   // content::RenderProcessObserver implementation.
   virtual bool OnControlMessageReceived(const IPC::Message& message) OVERRIDE;
 
+  UserScriptSet* GetProgrammaticScriptsByExtension(
+      const ExtensionId& extensionId);
+
   // Handle the UpdateUserScripts extension message.
   void OnUpdateUserScripts(base::SharedMemoryHandle shared_memory,
                            const ExtensionId& extension_id,
                            const std::set<std::string>& changed_extensions);
 
   // Scripts statically defined in extension manifests.
   UserScriptSet static_scripts_;
 
   // Scripts programmatically-defined through API calls (initialized and stored
   // per-extension).
   UserScriptSetMap programmatic_scripts_;
 
   // The set of all known extensions. Owned by the Dispatcher.
   const ExtensionSet* extensions_;
 
   // The associated observers.
   ObserverList<Observer> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(UserScriptSetManager);
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_RENDERER_USER_SCRIPT_SET_MANAGER_H_