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

extensions/browser/guest_view/web_view/web_view_guest.cc

Index: extensions/browser/guest_view/web_view/web_view_guest.cc
diff --git a/extensions/browser/guest_view/web_view/web_view_guest.cc b/extensions/browser/guest_view/web_view/web_view_guest.cc
index 8b9bfb0391399deca42ff8a2b7724d372417e117..98e985e3123fb6819953841f4f24b36c62297cf8 100644
--- a/extensions/browser/guest_view/web_view/web_view_guest.cc
+++ b/extensions/browser/guest_view/web_view/web_view_guest.cc
@@ -34,6 +34,8 @@
 #include "extensions/browser/api/extensions_api_client.h"
 #include "extensions/browser/api/web_request/web_request_api.h"
 #include "extensions/browser/api/web_view/web_view_internal_api.h"
+#include "extensions/browser/declarative_user_script_manager.h"
+#include "extensions/browser/declarative_user_script_master.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/guest_view/guest_view_manager.h"
 #include "extensions/browser/guest_view/web_view/web_view_constants.h"
@@ -59,6 +61,7 @@ namespace extensions {
 
 namespace {
 
+

[Fady Samuel, 2015/03/04 02:02:10]

Remove this extra line.

[Xi Han, 2015/03/06 17:29:07]

Done.

 std::string WindowOpenDispositionToString(
   WindowOpenDisposition window_open_disposition) {
   switch (window_open_disposition) {
@@ -642,6 +645,49 @@ bool WebViewGuest::ClearData(const base::Time remove_since,
   return true;
 }
 
+bool WebViewGuest::IsHostIDEmpty() {

[Fady Samuel, 2015/03/04 02:02:10]

What does this mean?

[Xi Han, 2015/03/06 17:29:07]

This function returns whether the host_id_ is nullptr. I remove it for now and
update the get function of host_id_.

+  return !host_id_;
+}
+
+void WebViewGuest::AddContentScripts(const std::string& script_name,
+                                     const UserScript& script) {
+  if (!master_) {
+    CHECK(host_id_);
+    master_ = ExtensionSystem::Get(browser_context())
+                  ->declarative_user_script_manager()
+                  ->GetDeclarativeUserScriptMasterByID(*host_id_);
+  }
+  // If a script with the same script name exists, we delete the old one and
+  // then add the new one.
+  UserScriptMap::iterator iter = user_script_map_.find(script_name);
+  if (iter != user_script_map_.end()) {
+    master_->RemoveScript(iter->second);
+    user_script_map_.erase(iter);
+  }
+
+  user_script_map_.insert(
+      std::pair<std::string, UserScript>(script_name, script));
+  master_->AddScript(script);

[Fady Samuel, 2015/03/04 02:02:10]

Does this plumbing work now?

[Xi Han, 2015/03/06 17:29:07]

For webUI, since webUI needs a different way to load user script, it doesn't
work for sure. The support for webUI will be in a different patch. 

For extensions, it has worked:)

+}
+
+void WebViewGuest::RemoveContentScripts(const std::string& script_name) {
+  auto iter = user_script_map_.find(script_name);
+  if (iter == user_script_map_.end() || !master_)
+    return;
+  master_->RemoveScript(iter->second);
+  user_script_map_.erase(iter);
+}
+
+void WebViewGuest::RemoveAllContentScripts() {
+  if (!master_)
+    return;
+  auto iter = user_script_map_.begin();
+  while(iter != user_script_map_.end()) {
+    master_->RemoveScript(iter->second);
+    iter = user_script_map_.erase(iter);
+  }
+}
+
 WebViewGuest::WebViewGuest(content::WebContents* owner_web_contents)
     : GuestView<WebViewGuest>(owner_web_contents),
       rules_registry_id_(RulesRegistryService::kInvalidRulesRegistryID),
@@ -651,6 +697,8 @@ WebViewGuest::WebViewGuest(content::WebContents* owner_web_contents)
       javascript_dialog_helper_(this),
       current_zoom_factor_(1.0),
       allow_scaling_(false),
+      host_id_(nullptr),
+      master_(nullptr),
       weak_ptr_factory_(this) {
   web_view_guest_delegate_.reset(
       ExtensionsAPIClient::Get()->CreateWebViewGuestDelegate(this));