From 8d034e56507a74b9030f309455b325dbaeeb5c1c Mon Sep 17 00:00:00 2001 From: "rdevlin.cronin" Date: Tue, 2 Feb 2016 14:46:32 -0800 Subject: [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} --- extensions/common/extension_messages.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'extensions/common') diff --git a/extensions/common/extension_messages.h b/extensions/common/extension_messages.h index cadb33f..2e025ac 100644 --- a/extensions/common/extension_messages.h +++ b/extensions/common/extension_messages.h @@ -41,6 +41,9 @@ IPC_ENUM_TRAITS_MAX_VALUE(content::SocketPermissionRequest::OperationType, IPC_ENUM_TRAITS_MAX_VALUE(extensions::UserScript::InjectionType, extensions::UserScript::INJECTION_TYPE_LAST) +IPC_ENUM_TRAITS_MAX_VALUE(extensions::UserScript::RunLocation, + extensions::UserScript::RUN_LOCATION_LAST - 1) + IPC_ENUM_TRAITS_MAX_VALUE(HostID::HostType, HostID::HOST_TYPE_LAST) // Parameters structure for ExtensionHostMsg_AddAPIActionToActivityLog and @@ -698,9 +701,10 @@ IPC_MESSAGE_ROUTED2(ExtensionHostMsg_ContentScriptsExecuting, // If request id is -1, this signals that the request has already ran, and this // merely serves as a notification. This happens when the feature to disable // scripts running without user consent is not enabled. -IPC_MESSAGE_ROUTED3(ExtensionHostMsg_RequestScriptInjectionPermission, +IPC_MESSAGE_ROUTED4(ExtensionHostMsg_RequestScriptInjectionPermission, std::string /* extension id */, extensions::UserScript::InjectionType /* script type */, + extensions::UserScript::RunLocation /* run location */, int64_t /* request id */) // Sent from the browser to the renderer in reply to a -- cgit v1.1