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 bddc0c5707ad149e96b6d5217aaef9cff329e451..701ea6702643b5ba38d7a5c0f2c3b53dd6c03236 100644 |
--- a/chrome/browser/extensions/active_script_controller.cc |
+++ b/chrome/browser/extensions/active_script_controller.cc |
@@ -14,6 +14,7 @@ |
#include "chrome/browser/extensions/extension_action_manager.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" |
@@ -28,6 +29,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" |
@@ -102,6 +105,42 @@ 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; |
Devlin
2014/08/13 16:55:03
no extensions:: prefix.
gpdavis
2014/08/13 22:18:36
Done.
|
+ 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(), |
Devlin
2014/08/13 16:55:03
no extensions::
gpdavis
2014/08/13 22:18:36
Done.
|
+ 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()); |
Devlin
2014/08/13 16:55:03
no extensions::
gpdavis
2014/08/13 22:18:36
Done.
|
+ updater.AddPermissions(extension, new_permissions.get()); |
Devlin
2014/08/13 16:55:03
One line:
PermissionsUpdater(web_contents()->GetBr
gpdavis
2014/08/13 22:18:36
Done.
|
+ |
+ // 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) |