Renderer changes for wiring up shared memory with declarative injection

extensions/renderer/user_script_set.h

Index: extensions/renderer/user_script_set.h
diff --git a/extensions/renderer/user_script_set.h b/extensions/renderer/user_script_set.h
index e5e91fd418b2158bdfa0852cbcb43467b592da97..228c0d32940535219ed1dfd7a5af50d9f7261e4b 100644
--- a/extensions/renderer/user_script_set.h
+++ b/extensions/renderer/user_script_set.h
@@ -16,6 +16,7 @@
 #include "base/observer_list.h"
 #include "content/public/renderer/render_process_observer.h"
 #include "extensions/common/user_script.h"
+#include "extensions/renderer/script_injection.h"

[Devlin, 2014/08/26 21:59:16]

!

[Mark Dittmer, 2014/08/27 22:37:04]

Replied to this in last round. Sorry for the confusion.

 
 class GURL;
 
@@ -26,7 +27,6 @@ class WebFrame;
 namespace extensions {
 class Extension;
 class ExtensionSet;
-class ScriptInjection;
 
 // The UserScriptSet is a collection of UserScripts which knows how to update
 // itself from SharedMemory and create ScriptInjections for UserScripts to
@@ -59,6 +59,14 @@ class UserScriptSet {
                      int tab_id,
                      UserScript::RunLocation run_location);
 
+  scoped_ptr<ScriptInjection> GetInjectionByScriptID(
+      int script_id,
+      blink::WebFrame* web_frame,
+      int tab_id,
+      UserScript::RunLocation run_location,
+      const GURL& document_url,
+      const Extension* extension);
+
   // Updates scripts given the shared memory region containing user scripts.
   // Returns true if the scripts were successfully updated.
   bool UpdateUserScripts(base::SharedMemoryHandle shared_memory,
@@ -75,7 +83,8 @@ class UserScriptSet {
       int tab_id,
       UserScript::RunLocation run_location,
       const GURL& document_url,
-      const Extension* extension);
+      const Extension* extension,
+      bool is_declarative);
 
   // Shared memory containing raw script data.
   scoped_ptr<base::SharedMemory> shared_memory_;