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

Unified Diff: chrome/browser/extensions/api/permissions/permissions_api_helpers.cc

Issue 51433002: Enable permission warnings from ManifestHandlers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix unit test and clang presubmit errors. Created 7 years, 1 month 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/api/permissions/permissions_api_helpers.cc
diff --git a/chrome/browser/extensions/api/permissions/permissions_api_helpers.cc b/chrome/browser/extensions/api/permissions/permissions_api_helpers.cc
index 620c8c5f6b5f872dcd237592027cf6265e1051fd..2b90287e8d5669fdf5c574f033bbbcc71db646ab 100644
--- a/chrome/browser/extensions/api/permissions/permissions_api_helpers.cc
+++ b/chrome/browser/extensions/api/permissions/permissions_api_helpers.cc
@@ -56,6 +56,9 @@ scoped_ptr<Permissions> PackPermissionSet(const PermissionSet* set) {
}
}
+ // TODO(rpaquay): We currently don't expose manifest permissions
+ // to apps/extensions via the permissions API.
+
permissions->origins.reset(new std::vector<std::string>());
URLPatternSet hosts = set->explicit_hosts();
for (URLPatternSet::const_iterator i = hosts.begin(); i != hosts.end(); ++i)
@@ -121,6 +124,10 @@ scoped_refptr<PermissionSet> UnpackPermissionSet(
}
}
+ // TODO(rpaquay): We currently don't expose manifest permissions
+ // to apps/extensions via the permissions API.
+ ManifestPermissionSet manifest_permissions;
+
URLPatternSet origins;
if (permissions.origins.get()) {
for (std::vector<std::string>::iterator it = permissions.origins->begin();
@@ -142,7 +149,7 @@ scoped_refptr<PermissionSet> UnpackPermissionSet(
}
return scoped_refptr<PermissionSet>(
- new PermissionSet(apis, origins, URLPatternSet()));
+ new PermissionSet(apis, manifest_permissions, origins, URLPatternSet()));
}
} // namespace permissions_api_helpers

Powered by Google App Engine
This is Rietveld 408576698