| 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..06d39609311faede03b78383f5517ffc923a26a1 100644
|
| --- a/chrome/browser/extensions/active_script_controller.cc
|
| +++ b/chrome/browser/extensions/active_script_controller.cc
|
| @@ -13,19 +13,23 @@
|
| #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/profiles/profile.h"
|
| #include "chrome/browser/sessions/session_id.h"
|
| #include "chrome/common/extensions/api/extension_action/action_info.h"
|
| #include "content/public/browser/navigation_controller.h"
|
| #include "content/public/browser/navigation_entry.h"
|
| #include "content/public/browser/render_view_host.h"
|
| #include "content/public/browser/web_contents.h"
|
| +#include "extensions/browser/extension_prefs.h"
|
| #include "extensions/browser/extension_registry.h"
|
| #include "extensions/common/extension.h"
|
| #include "extensions/common/extension_messages.h"
|
| #include "extensions/common/extension_set.h"
|
| #include "extensions/common/feature_switch.h"
|
| #include "extensions/common/manifest.h"
|
| +#include "extensions/common/permissions/permission_set.h"
|
| #include "extensions/common/permissions/permissions_data.h"
|
| #include "ipc/ipc_message_macros.h"
|
|
|
| @@ -100,6 +104,38 @@ void ActiveScriptController::OnAdInjectionDetected(
|
| ad_injectors.size() - num_preventable_ad_injectors);
|
| }
|
|
|
| +void ActiveScriptController::AddPersistedPermission(
|
| + const Extension* extension) {
|
| + // Allow current tab to run injection.
|
| + OnClicked(extension);
|
| +
|
| + GURL url = web_contents()->GetVisibleURL();
|
| + extensions::URLPatternSet new_hosts;
|
| + URLPattern pattern(extensions::UserScript::ValidUserScriptSchemes());
|
| +
|
| + pattern.SetScheme(url.scheme());
|
| + pattern.SetHost(url.host());
|
| + pattern.SetPath("/*");
|
| + new_hosts.AddPattern(pattern);
|
| +
|
| + scoped_refptr<extensions::PermissionSet> new_permissions =
|
| + new extensions::PermissionSet(extensions::APIPermissionSet(),
|
| + extensions::ManifestPermissionSet(),
|
| + extensions::URLPatternSet(),
|
| + new_hosts);
|
| +
|
| + // Update active permissions for the session.
|
| + extensions::PermissionsUpdater updater(
|
| + Profile::FromBrowserContext(web_contents()->GetBrowserContext()));
|
| + updater.AddPermissions(extension, new_permissions.get());
|
| +
|
| + // Update persisted permissions for extension.
|
| + extensions::ExtensionPrefs* prefs =
|
| + extensions::ExtensionPrefs::Get(web_contents()->GetBrowserContext());
|
| + prefs->ClearPersistedPermissions(extension);
|
| + prefs->AddPersistedPermission(extension, &pattern);
|
| +}
|
| +
|
| ExtensionAction* ActiveScriptController::GetActionForExtension(
|
| const Extension* extension) {
|
| if (!enabled_ || pending_requests_.count(extension->id()) == 0)
|
|
|