| Index: ppapi/shared_impl/ppapi_permissions.h
|
| diff --git a/ppapi/shared_impl/ppapi_permissions.h b/ppapi/shared_impl/ppapi_permissions.h
|
| index d9d2cd83a014b2888373e64cbc031840c92a4a23..f9d8b12a6b13ed93ed1cf23184380df560716da6 100644
|
| --- a/ppapi/shared_impl/ppapi_permissions.h
|
| +++ b/ppapi/shared_impl/ppapi_permissions.h
|
| @@ -11,17 +11,34 @@
|
| namespace ppapi {
|
|
|
| enum Permission {
|
| + // Placeholder/uninitialized permission.
|
| + PERMISSION_NONE = 0,
|
| +
|
| // Allows access to dev interfaces.
|
| PERMISSION_DEV = 1 << 0,
|
|
|
| // Allows access to Browser-internal interfaces.
|
| - PERMISSION_PRIVATE = 1 << 2,
|
| + PERMISSION_PRIVATE = 1 << 1,
|
|
|
| // Allows ability to bypass user-gesture checks for showing things like
|
| // file select dialogs.
|
| - PERMISSION_BYPASS_USER_GESTURE = 1 << 3,
|
| + PERMISSION_BYPASS_USER_GESTURE = 1 << 2,
|
| +
|
| + // Testing-only interfaces.
|
| + PERMISSION_TESTING = 1 << 3,
|
| +
|
| + // Flash-related interfaces.
|
| + PERMISSION_FLASH = 1 << 4,
|
| +
|
| + // NOTE: If you add stuff be sure to update PERMISSION_ALL_BITS.
|
|
|
| - // NOTE: If you add stuff be sure to update AllPermissions().
|
| + // Meta permission for initializing plugins registered on the command line
|
| + // that get all permissions.
|
| + PERMISSION_ALL_BITS = PERMISSION_DEV |
|
| + PERMISSION_PRIVATE |
|
| + PERMISSION_BYPASS_USER_GESTURE |
|
| + PERMISSION_TESTING |
|
| + PERMISSION_FLASH
|
| };
|
|
|
| class PPAPI_SHARED_EXPORT PpapiPermissions {
|
| @@ -40,8 +57,7 @@ class PPAPI_SHARED_EXPORT PpapiPermissions {
|
|
|
| bool HasPermission(Permission perm) const;
|
|
|
| - // TODO(brettw) bug 147507: Remove this when we fix the permissions bug
|
| - // (this was added for logging).
|
| + // Returns the internal permission bits. Use for serialization only.
|
| uint32 GetBits() const { return permissions_; }
|
|
|
| private:
|
|
|