extensions/browser/script_executor.cc - Issue 952473002: Add frameId to executeScript/insertCSS

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/script_executor.cc

Issue 952473002: Add frameId to executeScript/insertCSS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Revert change to error message, moved to https://codereview.chromium.org/945743003/ 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:

Index: extensions/browser/script_executor.cc

diff --git a/extensions/browser/script_executor.cc b/extensions/browser/script_executor.cc

index ac3e671b9a48c056a0344f16c51a92ab5b2a2372..2ce1c7ea4177709039da2af1e53746098270d90e 100644

--- a/extensions/browser/script_executor.cc

+++ b/extensions/browser/script_executor.cc

@@ -117,6 +117,7 @@ void ScriptExecutor::ExecuteScript(const std::string& extension_id,

ScriptExecutor::ScriptType script_type,

const std::string& code,

ScriptExecutor::FrameScope frame_scope,

+ int frame_id,

ScriptExecutor::MatchAboutBlank about_blank,

UserScript::RunLocation run_at,

ScriptExecutor::WorldType world_type,

@@ -139,6 +140,7 @@ void ScriptExecutor::ExecuteScript(const std::string& extension_id,

params.is_javascript = (script_type == JAVASCRIPT);

params.code = code;

params.all_frames = (frame_scope == ALL_FRAMES);

+ params.frame_id = frame_id;

params.match_about_blank = (about_blank == MATCH_ABOUT_BLANK);

params.run_at = static_cast<int>(run_at);

params.in_main_world = (world_type == MAIN_WORLD);