| 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 38fb80ea2ba3c233c143203e626b38984921fafb..96abaff9b1761262bb7ffdb2797d762ca05f9b29 100644
|
| --- a/extensions/common/permissions/api_permission_set.cc
|
| +++ b/extensions/common/permissions/api_permission_set.cc
|
| @@ -183,47 +183,91 @@ void APIPermissionSet::AddImpliedPermissions() {
|
| }
|
| }
|
|
|
| -PermissionIDSet::PermissionIDSet() : permissions() {
|
| +PermissionID::PermissionID(APIPermission::ID id)
|
| + : std::pair<APIPermission::ID, base::string16>(id, base::string16()) {
|
| +}
|
| +
|
| +PermissionID::PermissionID(APIPermission::ID id,
|
| + const base::string16& parameter)
|
| + : std::pair<APIPermission::ID, base::string16>(id, parameter) {
|
| +}
|
| +
|
| +PermissionID::~PermissionID() {
|
| +}
|
| +
|
| +PermissionIDSet::PermissionIDSet() : permissions_() {
|
| }
|
|
|
| PermissionIDSet::~PermissionIDSet() {
|
| }
|
|
|
| -PermissionIDSet::PermissionIDSet(APIPermission::ID permission_one) {
|
| +PermissionIDSet::PermissionIDSet(APIPermission::ID permission_one)
|
| + : permissions_() {
|
| + insert(permission_one);
|
| +}
|
| +
|
| +PermissionIDSet::PermissionIDSet(APIPermission::ID permission_one,
|
| + APIPermission::ID permission_two)
|
| + : permissions_() {
|
| + insert(permission_one);
|
| + insert(permission_two);
|
| +}
|
| +
|
| +PermissionIDSet::PermissionIDSet(APIPermission::ID permission_one,
|
| + APIPermission::ID permission_two,
|
| + APIPermission::ID permission_three)
|
| + : permissions_() {
|
| insert(permission_one);
|
| + insert(permission_two);
|
| + insert(permission_three);
|
| }
|
|
|
| PermissionIDSet::PermissionIDSet(APIPermission::ID permission_one,
|
| - APIPermission::ID permission_two) {
|
| + APIPermission::ID permission_two,
|
| + APIPermission::ID permission_three,
|
| + APIPermission::ID permission_four)
|
| + : permissions_() {
|
| insert(permission_one);
|
| insert(permission_two);
|
| + insert(permission_three);
|
| + insert(permission_four);
|
| }
|
|
|
| PermissionIDSet::PermissionIDSet(APIPermission::ID permission_one,
|
| APIPermission::ID permission_two,
|
| - APIPermission::ID permission_three) {
|
| + APIPermission::ID permission_three,
|
| + APIPermission::ID permission_four,
|
| + APIPermission::ID permission_five)
|
| + : permissions_() {
|
| insert(permission_one);
|
| insert(permission_two);
|
| insert(permission_three);
|
| + insert(permission_four);
|
| + insert(permission_five);
|
| }
|
|
|
| PermissionIDSet::PermissionIDSet(APIPermission::ID permission_one,
|
| APIPermission::ID permission_two,
|
| APIPermission::ID permission_three,
|
| - APIPermission::ID permission_four) {
|
| + APIPermission::ID permission_four,
|
| + APIPermission::ID permission_five,
|
| + APIPermission::ID permission_six)
|
| + : permissions_() {
|
| insert(permission_one);
|
| insert(permission_two);
|
| insert(permission_three);
|
| insert(permission_four);
|
| + insert(permission_five);
|
| + insert(permission_six);
|
| }
|
|
|
| -void PermissionIDSet::insert(APIPermission::ID permission) {
|
| - permissions.insert(PermissionID(permission, base::string16()));
|
| +void PermissionIDSet::insert(APIPermission::ID permission_id) {
|
| + permissions_.insert(PermissionID(permission_id, base::string16()));
|
| }
|
|
|
| -void PermissionIDSet::insert(APIPermission::ID permission,
|
| - base::string16 permission_detail) {
|
| - permissions.insert(PermissionID(permission, permission_detail));
|
| +void PermissionIDSet::insert(APIPermission::ID permission_id,
|
| + base::string16 permission_parameter) {
|
| + permissions_.insert(PermissionID(permission_id, permission_parameter));
|
| }
|
|
|
| } // namespace extensions
|
|
|