extensions/browser/guest_view/web_view/web_view_guest.cc - Issue 959413003: Implement <webview>.addContentScript/removeContentScript API [1]

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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 comments. 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

« no previous file with comments | « extensions/browser/guest_view/web_view/web_view_content_script_manager.cc ('k') | extensions/browser/guest_view/web_view/web_view_renderer_state.h » ('j') | extensions/browser/guest_view/web_view/web_view_renderer_state.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 34c4a15d2bb9930e761965756b30f3f28c0458b7..cc9053ffd6e8152d10c001dcfc7bccaa4ab3f6cd 100644

--- a/extensions/browser/guest_view/web_view/web_view_guest.cc

+++ b/extensions/browser/guest_view/web_view/web_view_guest.cc

@@ -37,6 +37,7 @@

#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"

+#include "extensions/browser/guest_view/web_view/web_view_content_script_manager.h"

#include "extensions/browser/guest_view/web_view/web_view_permission_helper.h"

#include "extensions/browser/guest_view/web_view/web_view_permission_types.h"

#include "extensions/browser/guest_view/web_view/web_view_renderer_state.h"

@@ -870,6 +871,14 @@ void WebViewGuest::PushWebViewStateToIOThread() {

web_view_info.owner_extension_id = owner_extension_id();

web_view_info.rules_registry_id = rules_registry_id_;

+ // Get content scripts IDs added by the guest.

+ WebViewContentScriptManager* manager =

+ WebViewContentScriptManager::Get(browser_context());

+ if (manager) {

Fady Samuel 2015/04/02 21:46:09 Why would we not have a manager? I think make it D

+ web_view_info.content_script_ids = manager->GetContentScriptIDSet(

+ web_view_info.embedder_process_id, web_view_info.instance_id);

+ }

content::BrowserThread::PostTask(

content::BrowserThread::IO,

FROM_HERE,