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

Unified Diff: extensions/browser/guest_view/guest_view_message_filter.cc

Issue 959413003: Implement <webview>.addContentScript/removeContentScript API [1] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Make the API work before the first navigation of guest. 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/guest_view_message_filter.cc
diff --git a/extensions/browser/guest_view/guest_view_message_filter.cc b/extensions/browser/guest_view/guest_view_message_filter.cc
index 52f8d6bc9297fd127c4e7d774737bd938e5adcb7..57201b4c137711e14d93849aa846b2087e140078 100644
--- a/extensions/browser/guest_view/guest_view_message_filter.cc
+++ b/extensions/browser/guest_view/guest_view_message_filter.cc
@@ -11,6 +11,8 @@
#include "extensions/browser/guest_view/guest_view_manager.h"
#include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_constants.h"
#include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h"
+#include "extensions/browser/guest_view/web_view/web_view_content_script_manager.h"
+#include "extensions/browser/guest_view/web_view/web_view_renderer_state.h"
#include "extensions/common/guest_view/guest_view_messages.h"
#include "ipc/ipc_message_macros.h"
@@ -61,6 +63,8 @@ bool GuestViewMessageFilter::OnMessageReceived(const IPC::Message& message) {
IPC_MESSAGE_HANDLER(GuestViewHostMsg_CreateMimeHandlerViewGuest,
OnCreateMimeHandlerViewGuest)
IPC_MESSAGE_HANDLER(GuestViewHostMsg_ResizeGuest, OnResizeGuest)
+ IPC_MESSAGE_HANDLER(GuestViewHostMsg_CanExecuteContentScript,
+ OnCanExecuteContentScript)
IPC_MESSAGE_UNHANDLED(handled = false)
IPC_END_MESSAGE_MAP()
return handled;
@@ -133,6 +137,22 @@ void GuestViewMessageFilter::OnResizeGuest(int render_frame_id,
mhvg->SetSize(set_size_params);
}
+void GuestViewMessageFilter::OnCanExecuteContentScript(int render_view_id,
+ int script_id,
+ bool* allowed) {
+ WebViewRendererState::WebViewInfo info;
+ WebViewRendererState::GetInstance()->GetInfo(render_process_id_,
+ render_view_id, &info);
Fady Samuel 2015/03/27 20:25:36 Don't use WebViewRendererState, use GuestViewManag
Xi Han 2015/03/30 17:50:49 Done.
+ WebViewContentScriptManager* manager =
+ WebViewContentScriptManager::Get(browser_context_);
+ if (!manager) {
+ *allowed = false;
+ return;
+ }
+ *allowed = manager->OwnsUserScript(info.embedder_process_id, info.instance_id,
+ script_id);
+}
+
void GuestViewMessageFilter::MimeHandlerViewGuestCreatedCallback(
int element_instance_id,
int embedder_render_process_id,

Powered by Google App Engine
This is Rietveld 408576698