Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2627)

Unified Diff: chrome/browser/extensions/permissions_updater.cc

Issue 396033002: Support "always allow" for runtime script execution (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Histogram updates Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/permissions_updater.cc
diff --git a/chrome/browser/extensions/permissions_updater.cc b/chrome/browser/extensions/permissions_updater.cc
index 5f2f62981d5889f7db19804d7734561aaaac5b9f..83dc755d478dfe507815bbadd29328e257596002 100644
--- a/chrome/browser/extensions/permissions_updater.cc
+++ b/chrome/browser/extensions/permissions_updater.cc
@@ -67,6 +67,32 @@ scoped_refptr<const PermissionSet> GetBoundedActivePermissions(
adjusted_active =
PermissionSet::CreateUnion(required_permissions, adjusted_active);
+ // Re-add any active permissions that only match a single origin in order
+ // to persist "always run" script injection hosts.
not at google - send to devlin 2014/08/11 22:59:30 Mention why they were filtered out in the first pl
gpdavis 2014/08/12 00:52:05 Done.
not at google - send to devlin 2014/08/12 19:49:26 The comment still doesn't work for me, but I think
+ URLPatternSet single_origin_explicit;
+ URLPatternSet single_origin_scriptable;
+ for (URLPatternSet::const_iterator iter =
+ active_permissions->explicit_hosts().begin();
+ iter != active_permissions->explicit_hosts().end();
+ ++iter) {
+ if (iter->MatchesSingleOrigin())
+ single_origin_explicit.AddPattern(*iter);
+ }
+ for (URLPatternSet::const_iterator iter =
+ active_permissions->scriptable_hosts().begin();
+ iter != active_permissions->scriptable_hosts().end();
+ ++iter) {
+ if (iter->MatchesSingleOrigin())
+ single_origin_scriptable.AddPattern(*iter);
+ }
+
not at google - send to devlin 2014/08/11 22:59:30 you could write this much more concisely if you ha
gpdavis 2014/08/12 00:52:05 Done.
+ adjusted_active = PermissionSet::CreateUnion(
+ adjusted_active,
+ new PermissionSet(APIPermissionSet(),
+ ManifestPermissionSet(),
+ single_origin_explicit,
+ single_origin_scriptable));
+
return adjusted_active;
}

Powered by Google App Engine
This is Rietveld 408576698