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

Unified Diff: chrome/common/extensions/permission_feature.cc

Issue 10025007: Convert tabs, windows, and extension APIs to feature system. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: blah Created 8 years, 8 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
« no previous file with comments | « chrome/common/extensions/feature_unittest.cc ('k') | chrome/renderer/extensions/api_definitions_natives.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/extensions/permission_feature.cc
diff --git a/chrome/common/extensions/permission_feature.cc b/chrome/common/extensions/permission_feature.cc
index f0931926c22b51b7cf20e3bd4de4a679feadddf0..92fb2d54e897856a1372f4161fb9b861436fba14 100644
--- a/chrome/common/extensions/permission_feature.cc
+++ b/chrome/common/extensions/permission_feature.cc
@@ -24,9 +24,22 @@ Feature::Availability PermissionFeature::IsAvailableToContext(
if (availability != IS_AVAILABLE)
return availability;
- if (!extension->HasAPIPermission(name()))
+ // TODO(aa): Lame to check optional permissions too (instead of just currently
+ // active permissions), but schema_generated_bindings.js calls this at
+ // bindings setup time, not call time. So it doesn't react properly to changes
+ // after the bindings are setup.
+ ExtensionAPIPermission* permission =
+ ExtensionPermissionsInfo::GetInstance()->GetByName(name());
+ if (!permission)
return NOT_PRESENT;
+ if (!extension->required_permission_set()->HasAPIPermission(
+ permission->id()) &&
+ !extension->optional_permission_set()->HasAPIPermission(
+ permission->id())) {
+ return NOT_PRESENT;
+ }
+
return IS_AVAILABLE;
}
« no previous file with comments | « chrome/common/extensions/feature_unittest.cc ('k') | chrome/renderer/extensions/api_definitions_natives.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698