| Index: chrome/common/extensions/extension_permission_set.h
|
| diff --git a/chrome/common/extensions/extension_permission_set.h b/chrome/common/extensions/extension_permission_set.h
|
| index 276119d3a14c8f090f01192fde3f6f425b920f02..4f5920e53dd7292c09133a244ee1ca2e2a53c0c9 100644
|
| --- a/chrome/common/extensions/extension_permission_set.h
|
| +++ b/chrome/common/extensions/extension_permission_set.h
|
| @@ -196,9 +196,6 @@ class ExtensionAPIPermission {
|
| // Instances should only be constructed from within ExtensionPermissionsInfo.
|
| friend class ExtensionPermissionsInfo;
|
|
|
| - // Register ALL the permissions!
|
| - static void RegisterAllPermissions(ExtensionPermissionsInfo* info);
|
| -
|
| explicit ExtensionAPIPermission(
|
| ID id,
|
| const char* name,
|
| @@ -206,6 +203,9 @@ class ExtensionAPIPermission {
|
| ExtensionPermissionMessage::ID message_id,
|
| int flags);
|
|
|
| + // Register ALL the permissions!
|
| + static void RegisterAllPermissions(ExtensionPermissionsInfo* info);
|
| +
|
| ID id_;
|
| const char* name_;
|
| int flags_;
|
| @@ -307,8 +307,6 @@ class ExtensionPermissionSet
|
| // Creates a new permission set containing only oauth scopes.
|
| explicit ExtensionPermissionSet(const ExtensionOAuth2Scopes& scopes);
|
|
|
| - ~ExtensionPermissionSet();
|
| -
|
| // Creates a new permission set equal to |set1| - |set2|, passing ownership of
|
| // the new set to the caller.
|
| static ExtensionPermissionSet* CreateDifference(
|
| @@ -400,9 +398,10 @@ class ExtensionPermissionSet
|
| private:
|
| FRIEND_TEST_ALL_PREFIXES(ExtensionPermissionsTest,
|
| HasLessHostPrivilegesThan);
|
| -
|
| friend class base::RefCountedThreadSafe<ExtensionPermissionSet>;
|
|
|
| + ~ExtensionPermissionSet();
|
| +
|
| static std::set<std::string> GetDistinctHosts(
|
| const URLPatternSet& host_patterns,
|
| bool include_rcd,
|
|
|