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

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

Issue 11413099: Bluetooth API Permission Dialogs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix memory leak Created 8 years 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.cc
diff --git a/chrome/browser/extensions/api/permissions/permissions_api.cc b/chrome/browser/extensions/api/permissions/permissions_api.cc
index 9ffa02e446cc9185c127e8f5c31c42b73077e65b..c395b9d1de9f52106bbefa36b562fd89bc744e2c 100644
--- a/chrome/browser/extensions/api/permissions/permissions_api.cc
+++ b/chrome/browser/extensions/api/permissions/permissions_api.cc
@@ -169,9 +169,16 @@ bool RequestPermissionsFunction::RunImpl() {
}
}
+ // Filter out permissions that do not need to be listed in the optional
+ // section of the manifest.
+ scoped_refptr<extensions::PermissionSet>
+ manifest_required_requested_permissions =
+ PermissionSet::ExcludeNotInManifestPermissions(
+ requested_permissions_.get());
+
// The requested permissions must be defined as optional in the manifest.
if (!GetExtension()->optional_permission_set()->Contains(
- *requested_permissions_)) {
+ *manifest_required_requested_permissions)) {
error_ = kNotInOptionalPermissionsError;
results_ = Request::Results::Create(false);
return false;

Powered by Google App Engine
This is Rietveld 408576698