| Index: extensions/common/permissions/api_permission_set.cc
|
| diff --git a/extensions/common/permissions/api_permission_set.cc b/extensions/common/permissions/api_permission_set.cc
|
| index d5b14a083ef52db2477e5d31b3781f411359071f..a6a11f56350a67e5b05e0a7c059a923024db5ad0 100644
|
| --- a/extensions/common/permissions/api_permission_set.cc
|
| +++ b/extensions/common/permissions/api_permission_set.cc
|
| @@ -197,6 +197,13 @@ PermissionID::~PermissionID() {
|
| PermissionIDSet::PermissionIDSet() {
|
| }
|
|
|
| +PermissionIDSet::PermissionIDSet(
|
| + std::initializer_list<APIPermission::ID> permissions) {
|
| + for (auto permission : permissions) {
|
| + permissions_.insert(PermissionID(permission));
|
| + }
|
| +}
|
| +
|
| PermissionIDSet::PermissionIDSet(const PermissionIDSet& other) = default;
|
|
|
| PermissionIDSet::~PermissionIDSet() {
|
| @@ -236,9 +243,13 @@ std::vector<base::string16> PermissionIDSet::GetAllPermissionParameters()
|
| return params;
|
| }
|
|
|
| +bool PermissionIDSet::ContainsID(PermissionID permission_id) const {
|
| + auto it = permissions_.lower_bound(permission_id);
|
| + return it != permissions_.end() && it->id() == permission_id.id();
|
| +}
|
| +
|
| bool PermissionIDSet::ContainsID(APIPermission::ID permission_id) const {
|
| - auto it = permissions_.lower_bound(PermissionID(permission_id));
|
| - return it != permissions_.end() && it->id() == permission_id;
|
| + return ContainsID(PermissionID(permission_id));
|
| }
|
|
|
| bool PermissionIDSet::ContainsAllIDs(
|
| @@ -260,6 +271,14 @@ bool PermissionIDSet::ContainsAnyID(
|
| return false;
|
| }
|
|
|
| +bool PermissionIDSet::ContainsAnyID(const PermissionIDSet& other) const {
|
| + for (const auto& id : other) {
|
| + if (ContainsID(id))
|
| + return true;
|
| + }
|
| + return false;
|
| +}
|
| +
|
| PermissionIDSet PermissionIDSet::GetAllPermissionsWithID(
|
| APIPermission::ID permission_id) const {
|
| PermissionIDSet subset;
|
|
|