| Index: chrome/browser/extensions/active_script_controller.cc
|
| diff --git a/chrome/browser/extensions/active_script_controller.cc b/chrome/browser/extensions/active_script_controller.cc
|
| index 1b35b2872c9415706f9bd7585315856576cdc57b..1cf40193db60adc1fb68857b1625212c7dea0deb 100644
|
| --- a/chrome/browser/extensions/active_script_controller.cc
|
| +++ b/chrome/browser/extensions/active_script_controller.cc
|
| @@ -13,6 +13,7 @@
|
| #include "chrome/browser/extensions/extension_action.h"
|
| #include "chrome/browser/extensions/extension_util.h"
|
| #include "chrome/browser/extensions/location_bar_controller.h"
|
| +#include "chrome/browser/extensions/permissions_updater.h"
|
| #include "chrome/browser/extensions/tab_helper.h"
|
| #include "chrome/browser/sessions/session_id.h"
|
| #include "chrome/common/extensions/api/extension_action/action_info.h"
|
| @@ -26,6 +27,8 @@
|
| #include "extensions/common/extension_set.h"
|
| #include "extensions/common/feature_switch.h"
|
| #include "extensions/common/manifest.h"
|
| +#include "extensions/common/manifest_handlers/permissions_parser.h"
|
| +#include "extensions/common/permissions/permission_set.h"
|
| #include "extensions/common/permissions/permissions_data.h"
|
| #include "ipc/ipc_message_macros.h"
|
|
|
| @@ -100,6 +103,52 @@ void ActiveScriptController::OnAdInjectionDetected(
|
| ad_injectors.size() - num_preventable_ad_injectors);
|
| }
|
|
|
| +void ActiveScriptController::AlwaysRunOnVisibleHost(
|
| + const Extension* extension) {
|
| + GURL url = web_contents()->GetVisibleURL();
|
| + extensions::URLPatternSet new_explicit_hosts;
|
| + extensions::URLPatternSet new_scriptable_hosts;
|
| +
|
| + scoped_refptr<const PermissionSet> withheld_permissions =
|
| + extension->permissions_data()->withheld_permissions();
|
| + if (withheld_permissions->explicit_hosts().MatchesURL(url)) {
|
| + new_explicit_hosts.AddOrigin(
|
| + UserScript::ValidUserScriptSchemes(), url.GetOrigin());
|
| + }
|
| + if (withheld_permissions->scriptable_hosts().MatchesURL(url)) {
|
| + new_scriptable_hosts.AddOrigin(
|
| + UserScript::ValidUserScriptSchemes(), url.GetOrigin());
|
| + }
|
| +
|
| + scoped_refptr<extensions::PermissionSet> new_permissions =
|
| + new extensions::PermissionSet(extensions::APIPermissionSet(),
|
| + extensions::ManifestPermissionSet(),
|
| + new_explicit_hosts,
|
| + new_scriptable_hosts);
|
| +
|
| + // Update permissions for the session. This adds |new_permissions| to active
|
| + // permissions and granted permissions.
|
| + extensions::PermissionsUpdater updater(web_contents()->GetBrowserContext());
|
| + updater.AddPermissions(extension, new_permissions.get());
|
| +
|
| + URLPatternSet permissions_union;
|
| + URLPatternSet::CreateUnion(
|
| + withheld_permissions->scriptable_hosts(),
|
| + PermissionsParser::GetRequiredPermissions(extension)->scriptable_hosts(),
|
| + &permissions_union);
|
| + UMA_HISTOGRAM_COUNTS_100(
|
| + "Extensions.ActiveScriptController.AlwaysRunCount",
|
| + extension->permissions_data()->GetEffectiveHostPermissions().size() -
|
| + permissions_union.size());
|
| +
|
| + // Allow current tab to run injection.
|
| + OnClicked(extension);
|
| +}
|
| +
|
| +bool ActiveScriptController::HasActiveScriptAction(const Extension* extension) {
|
| + return enabled_ && active_script_actions_.count(extension->id()) > 0;
|
| +}
|
| +
|
| ExtensionAction* ActiveScriptController::GetActionForExtension(
|
| const Extension* extension) {
|
| if (!enabled_ || pending_requests_.count(extension->id()) == 0)
|
|
|