summaryrefslogtreecommitdiffstats
path: root/extensions/renderer
diff options
context:
space:
mode:
authorrdevlin.cronin <rdevlin.cronin@chromium.org>2016-02-02 14:46:32 -0800
committerCommit bot <commit-bot@chromium.org>2016-02-02 22:47:59 +0000
commit8d034e56507a74b9030f309455b325dbaeeb5c1c (patch)
tree744703a0185de21f5737483d5facac383a398bd9 /extensions/renderer
parent62351406cbe5712bf8c1c8a6a2307e18b25e4c53 (diff)
downloadchromium_src-8d034e56507a74b9030f309455b325dbaeeb5c1c.zip
chromium_src-8d034e56507a74b9030f309455b325dbaeeb5c1c.tar.gz
chromium_src-8d034e56507a74b9030f309455b325dbaeeb5c1c.tar.bz2
[Extensions] Wire up the ActiveScriptController for WebRequests
Add pieces in ActiveScriptController to handle web requests being blocked by click-to-script (--scripts-require-action). Right now, these are only stubs - the next patch will actually call them. BUG=460306 Review URL: https://codereview.chromium.org/1646133002 Cr-Commit-Position: refs/heads/master@{#373064}
Diffstat (limited to 'extensions/renderer')
-rw-r--r--extensions/renderer/script_injection.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/extensions/renderer/script_injection.cc b/extensions/renderer/script_injection.cc
index 2ab3c04..2606169 100644
--- a/extensions/renderer/script_injection.cc
+++ b/extensions/renderer/script_injection.cc
@@ -195,10 +195,8 @@ void ScriptInjection::RequestPermissionFromBrowser() {
// invalid request (which is treated like a notification).
request_id_ = g_next_pending_id++;
render_frame_->Send(new ExtensionHostMsg_RequestScriptInjectionPermission(
- render_frame_->GetRoutingID(),
- host_id().id(),
- injector_->script_type(),
- request_id_));
+ render_frame_->GetRoutingID(), host_id().id(), injector_->script_type(),
+ run_location_, request_id_));
}
void ScriptInjection::NotifyWillNotInject(