extensions/renderer/user_script_set.h - Issue 934763003: Refactoring: de-couple Extensions from "script injection System" [render side]:3

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/renderer/user_script_set.h

Issue 934763003: Refactoring: de-couple Extensions from "script injection System" [render side]:3 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@decouple_brower_isolated_world_routingid_user_script_1

Patch Set: Reset InjectionHost in ScriptInjection when extension is unloaded. Created 5 years, 10 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

« extensions/renderer/script_injection_manager.cc ('K') | « extensions/renderer/script_injection_manager.cc ('k') | extensions/renderer/user_script_set.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/renderer/user_script_set.h

diff --git a/extensions/renderer/user_script_set.h b/extensions/renderer/user_script_set.h

index e8d48f9ac89073da24d02dd0a1a8c806a4dc2802..a4c3729f780596fb169ba2566881d9dd0f09e67d 100644

--- a/extensions/renderer/user_script_set.h

+++ b/extensions/renderer/user_script_set.h

@@ -17,6 +17,7 @@

#include "content/public/renderer/render_process_observer.h"

#include "extensions/common/user_script.h"

+class InjectionHost;

class GURL;

namespace blink {

@@ -24,7 +25,6 @@ class WebFrame;

}

namespace extensions {

-class Extension;

class ExtensionSet;

class ScriptInjection;

@@ -64,8 +64,7 @@ class UserScriptSet {

blink::WebFrame* web_frame,

int tab_id,

UserScript::RunLocation run_location,

- const GURL& document_url,

- const Extension* extension);

+ const GURL& document_url);

// Updates scripts given the shared memory region containing user scripts.

// Returns true if the scripts were successfully updated.

@@ -83,7 +82,6 @@ class UserScriptSet {

int tab_id,

UserScript::RunLocation run_location,

const GURL& document_url,

- const Extension* extension,

bool is_declarative);

// Shared memory containing raw script data.

« extensions/renderer/script_injection_manager.cc ('K') | « extensions/renderer/script_injection_manager.cc ('k') | extensions/renderer/user_script_set.cc » ('j') | no next file with comments »