extensions/renderer/dispatcher.cc - Issue 885493007: Refactoring: de-couple Extensions from "script injection System" [render side] : 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/renderer/dispatcher.cc

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

Patch Set: Plumb script_injection_instance_id from WebViewGuest to script injection. Created 5 years, 11 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/renderer/dispatcher.cc

diff --git a/extensions/renderer/dispatcher.cc b/extensions/renderer/dispatcher.cc

index fde6bcd7fca38ba0845592bea9bc2ff351669f9e..4f2c3716da13a6ebfa7ae5ac21aa840d26210f32 100644

--- a/extensions/renderer/dispatcher.cc

+++ b/extensions/renderer/dispatcher.cc

@@ -234,7 +234,8 @@ const Extension* Dispatcher::GetExtensionFromFrameAndWorld(

std::string extension_id;

if (world_id != 0) {

// Isolated worlds (content script).

- extension_id = ScriptInjection::GetExtensionIdForIsolatedWorld(world_id);

+ extension_id =

+ ScriptInjection::GetHostIdForIsolatedWorld(world_id).id();

} else if (!frame->document().securityOrigin().isUnique()) {

// TODO(kalman): Delete the above check.

« extensions/common/host_id.h ('K') | « extensions/extensions.gyp ('k') | extensions/renderer/script_injection.h » ('j') | extensions/renderer/script_injection.h » ('J')