Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(11)

Unified Diff: extensions/browser/guest_view/web_view/web_view_guest.cc

Issue 959413003: Implement <webview>.addContentScript/removeContentScript API [1] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add a test. Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..441de1814cc5c9eafba2c07679eed54301997ac3 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"
@@ -642,6 +644,45 @@ bool WebViewGuest::ClearData(const base::Time remove_since,
return true;
}
+void WebViewGuest::AddContentScripts(const std::string& script_name,
Fady Samuel 2015/03/11 11:43:17 This name is wrong. It adds a single script. Reall
+ 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);
+}
+
+void WebViewGuest::RemoveContentScripts(const std::string& script_name) {
Fady Samuel 2015/03/11 11:43:17 This name is wrong. It removes a single script. Re
+ 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 +692,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));

Powered by Google App Engine
This is Rietveld 408576698