| Index: chrome/common/extensions/permissions/media_galleries_permission.cc
|
| ===================================================================
|
| --- chrome/common/extensions/permissions/media_galleries_permission.cc (revision 181366)
|
| +++ chrome/common/extensions/permissions/media_galleries_permission.cc (working copy)
|
| @@ -19,7 +19,6 @@
|
| const char MediaGalleriesPermission::kAllAutoDetectedPermission[] =
|
| "allAutoDetected";
|
| const char MediaGalleriesPermission::kReadPermission[] = "read";
|
| -const char MediaGalleriesPermission::kWritePermission[] = "write";
|
|
|
| MediaGalleriesPermission::MediaGalleriesPermission(
|
| const APIPermissionInfo* info)
|
| @@ -36,14 +35,10 @@
|
| return false;
|
| }
|
|
|
| - bool has_read = false;
|
| - bool has_write = false;
|
| for (std::set<MediaGalleriesPermissionData>::const_iterator it =
|
| data_set_.begin(); it != data_set_.end(); ++it) {
|
| if (it->permission() == kReadPermission) {
|
| - has_read = true;
|
| - } else if (it->permission() == kWritePermission) {
|
| - has_write = true;
|
| + continue;
|
| } else if (it->permission() == kAllAutoDetectedPermission) {
|
| continue;
|
| } else {
|
| @@ -55,8 +50,7 @@
|
| }
|
| }
|
|
|
| - // Read and write permissions are mutually exclusive.
|
| - return (!has_read || !has_write);
|
| + return true;
|
| }
|
|
|
| PermissionMessages MediaGalleriesPermission::GetMessages() const {
|
| @@ -65,7 +59,6 @@
|
|
|
| bool has_all_auto_detected = false;
|
| bool has_read = false;
|
| - bool has_write = false;
|
|
|
| for (std::set<MediaGalleriesPermissionData>::const_iterator it =
|
| data_set_.begin(); it != data_set_.end(); ++it) {
|
| @@ -73,24 +66,16 @@
|
| has_all_auto_detected = true;
|
| else if (it->permission() == kReadPermission)
|
| has_read = true;
|
| - else if (it->permission() == kWritePermission)
|
| - has_write = true;
|
| }
|
| - // FromValue() should never allow this.
|
| - DCHECK(!has_read || !has_write);
|
|
|
| // If |has_all_auto_detected| is false, then Chrome will prompt the user at
|
| // runtime when the extension call the getMediaGalleries API.
|
| - if (!has_all_auto_detected || !(has_read || has_write))
|
| + if (!has_all_auto_detected || !has_read)
|
| return result;
|
|
|
| - // Separate PermissionMessage IDs for read and write. Otherwise an extension
|
| - // can silently gain new access capabilities.
|
| - PermissionMessage::ID permission_id = has_write ?
|
| - PermissionMessage::kMediaGalleriesAllGalleriesWrite :
|
| + PermissionMessage::ID permission_id =
|
| PermissionMessage::kMediaGalleriesAllGalleriesRead;
|
| - int message_id = has_write ?
|
| - IDS_EXTENSION_PROMPT_WARNING_MEDIA_GALLERIES_READ_WRITE_ALL_GALLERIES :
|
| + int message_id =
|
| IDS_EXTENSION_PROMPT_WARNING_MEDIA_GALLERIES_READ_ALL_GALLERIES;
|
| result.push_back(
|
| PermissionMessage(permission_id, l10n_util::GetStringUTF16(message_id)));
|
|
|