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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/common/extensions/permissions/api_permission_set.cc

Issue 11348335: Revert 170514 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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
« no previous file with comments | « chrome/common/extensions/permissions/api_permission.cc ('k') | chrome/common/extensions/permissions/bluetooth_device_permission.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/extensions/permissions/api_permission_set.cc
===================================================================
--- chrome/common/extensions/permissions/api_permission_set.cc (revision 170599)
+++ chrome/common/extensions/permissions/api_permission_set.cc (working copy)
@@ -33,16 +33,9 @@
if (permission_info) {
scoped_ptr<APIPermission> permission(
permission_info->CreateAPIPermission());
- if (permission->ManifestEntryForbidden()) {
+ if (!permission->FromValue(permission_value)) {
if (error) {
*error = ErrorUtils::FormatErrorMessageUTF16(
- errors::kPermissionNotAllowedInManifest, permission_info->name());
- return false;
- }
- LOG(WARNING) << "Permission not allowed in manifest.";
- } else if (!permission->FromValue(permission_value)) {
- if (error) {
- *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidPermission, permission_info->name());
return false;
}
« no previous file with comments | « chrome/common/extensions/permissions/api_permission.cc ('k') | chrome/common/extensions/permissions/bluetooth_device_permission.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698