extensions/renderer/user_script_set_manager.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_manager.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/user_script_set.cc ('k') | extensions/renderer/user_script_set_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/renderer/user_script_set_manager.h

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

index d102ea33e2b1ec7e3d18cf2d9e9313e41c8b813c..4b5e4f053d72d9c3139e82610e900f1532ca8991 100644

--- a/extensions/renderer/user_script_set_manager.h

+++ b/extensions/renderer/user_script_set_manager.h

@@ -56,14 +56,15 @@ class UserScriptSetManager : public content::RenderProcessObserver {

void AddObserver(Observer* observer);

void RemoveObserver(Observer* observer);

- // Looks up the script injection associated with |script_id| and |extension|

- // in the context of the given |web_frame|, |tab_id|, and |url|.

+ // Looks up the script injection associated with |script_id| and

+ // |extension_id| in the context of the given |web_frame|, |tab_id|,

+ // and |url|.

scoped_ptr<ScriptInjection> GetInjectionForDeclarativeScript(

int script_id,

blink::WebFrame* web_frame,

int tab_id,

const GURL& url,

- const Extension* extension);

+ const std::string& extension_id);

// Append all injections from |static_scripts| and each of

// |programmatic_scripts_| to |injections|.

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