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

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

Issue 10692160: Support socket endpoint permissions for AppsV2 Socket API. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Support socket endpoint permissions Created 8 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/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 79bccac5ac842d66b27b090019e43a62815fd234..2b43174bae395ea952471e8ecbf0d89ff7150461 100644
--- a/chrome/browser/extensions/api/permissions/permissions_api.cc
+++ b/chrome/browser/extensions/api/permissions/permissions_api.cc
@@ -81,16 +81,14 @@ bool RemovePermissionsFunction::RunImpl() {
return false;
const extensions::Extension* extension = GetExtension();
- PermissionsInfo* info = PermissionsInfo::GetInstance();
// Make sure they're only trying to remove permissions supported by this API.
APIPermissionSet apis = permissions->apis();
for (APIPermissionSet::const_iterator i = apis.begin();
i != apis.end(); ++i) {
- const APIPermission* api = info->GetByID(*i);
- if (!api->supports_optional()) {
+ if (!i->permission()->supports_optional()) {
error_ = ExtensionErrorUtils::FormatErrorMessage(
- kNotWhitelistedError, api->name());
+ kNotWhitelistedError, i->name());
return false;
}
}
@@ -156,7 +154,6 @@ bool RequestPermissionsFunction::RunImpl() {
if (!requested_permissions_.get())
return false;
- PermissionsInfo* info = PermissionsInfo::GetInstance();
extensions::ExtensionPrefs* prefs =
profile()->GetExtensionService()->extension_prefs();
@@ -164,10 +161,9 @@ bool RequestPermissionsFunction::RunImpl() {
APIPermissionSet apis = requested_permissions_->apis();
for (APIPermissionSet::const_iterator i = apis.begin();
i != apis.end(); ++i) {
- const APIPermission* api = info->GetByID(*i);
- if (!api->supports_optional()) {
+ if (!i->permission()->supports_optional()) {
error_ = ExtensionErrorUtils::FormatErrorMessage(
- kNotWhitelistedError, api->name());
+ kNotWhitelistedError, i->name());
return false;
}
}

Powered by Google App Engine
This is Rietveld 408576698