extensions/browser/api/execute_code_function.cc - Issue 942533003: Enable <webview>.executeScript outside of Apps and Extensions [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/api/execute_code_function.cc

Issue 942533003: Enable <webview>.executeScript outside of Apps and Extensions [1] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@decouple_brower_isolated_world_routingid_user_script_UserScriptSet_non_hostset_2

Patch Set: Add a test. 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

« chrome/test/data/webui/webview_execute_script_test.js ('K') | « extensions/browser/api/execute_code_function.h ('k') | extensions/browser/api/web_view/web_view_internal_api.cc » ('j') | extensions/common/extension_messages.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/browser/api/execute_code_function.cc

diff --git a/extensions/browser/api/execute_code_function.cc b/extensions/browser/api/execute_code_function.cc

index 21845aa47ec48b07e549e7b449c10d0641799358..aebf61f46b4dd9dcec948e8cfa5326fea796cef3 100644

--- a/extensions/browser/api/execute_code_function.cc

+++ b/extensions/browser/api/execute_code_function.cc

@@ -129,7 +129,7 @@ bool ExecuteCodeFunction::Execute(const std::string& code_string) {

if (!executor)

return false;

- if (!extension())

+ if (!extension() && !IsWebView())

return false;

ScriptExecutor::ScriptType script_type = ScriptExecutor::JAVASCRIPT;

@@ -162,7 +162,7 @@ bool ExecuteCodeFunction::Execute(const std::string& code_string) {

CHECK_NE(UserScript::UNDEFINED, run_at);

executor->ExecuteScript(

- extension()->id(),

+ host_id_,

script_type,

code_string,

frame_scope,

@@ -204,6 +204,10 @@ bool ExecuteCodeFunction::RunAsync() {

if (!details_->file.get())

return false;

+ if (!extension())

+ return false;

resource_ = extension()->GetResource(*details_->file);

if (resource_.extension_root().empty() || resource_.relative_path().empty()) {