Implement <webview>.addContentScript/removeContentScript API [2]

extensions/browser/declarative_user_script_master.h

Index: extensions/browser/declarative_user_script_master.h
diff --git a/extensions/browser/declarative_user_script_master.h b/extensions/browser/declarative_user_script_master.h
index f5730396099498c46c1ead26a1aed2670e975992..ebe199554caba68684c71490e667f1f8141bc367 100644
--- a/extensions/browser/declarative_user_script_master.h
+++ b/extensions/browser/declarative_user_script_master.h
@@ -6,7 +6,7 @@
 #define EXTENSIONS_BROWSER_DECLARATIVE_USER_SCRIPT_MASTER_H_
 
 #include "base/scoped_observer.h"
-#include "extensions/browser/extension_user_script_loader.h"
+#include "extensions/browser/user_script_loader.h"

[Devlin, 2015/04/22 21:15:33]

I think a forward declaration would work for this.

[Xi Han, 2015/04/22 22:33:59]

Since we declare scoped_ptr<UserScriptLoader> loader_, we have to include this
file.

[Devlin, 2015/04/22 23:20:50]

scoped_ptr requires only a forward declaration, not the whole file.

[Xi Han, 2015/04/23 15:01:55]

Done.

 
 namespace content {
 class BrowserContext;
@@ -30,9 +30,13 @@ class DeclarativeUserScriptMaster {
   // script load is in progress.
   void AddScript(const UserScript& script);
 
-  // Adds a set of scripts to shared memory region. This may not happen right
-  // away if a script load is in progress.
-  void AddScripts(const std::set<UserScript>& scripts);
+  // Adds a set of scripts to shared meomory region. The fetch of the content
+  // of the script on WebUI requires to start URL request to the associated
+  // render specified by |render_process_id, render_view_id|.
+  // This may not happen right away if a script load is in progress.
+  void AddScripts(const std::set<UserScript>& scripts,
+                  int render_process_id,

[Devlin, 2015/04/22 21:15:33]

It's kind of a shame to have the render process/view ids here, because it
shouldn't really be needed.  But the workaround is a lot more effort, and the
layering violation is relatively small.  So how about just
TODO(hanxi): The renderer information doesn't really belong in this base class,
but it's not an easy fix.

[Xi Han, 2015/04/22 22:33:59]

Sounds fair to me.

+                  int render_view_id);
 
   // Removes script from shared memory region. This may not happen right away if
   // a script load is in progress.
@@ -54,7 +58,7 @@ class DeclarativeUserScriptMaster {
 
   // Script loader that handles loading contents of scripts into shared memory
   // and notifying renderers of script updates.
-  ExtensionUserScriptLoader loader_;
+  scoped_ptr<UserScriptLoader> loader_;
 
   DISALLOW_COPY_AND_ASSIGN(DeclarativeUserScriptMaster);
 };