Index: chrome/browser/extensions/extension_permissions_api_helpers.h |
diff --git a/chrome/browser/extensions/extension_permissions_api_helpers.h b/chrome/browser/extensions/extension_permissions_api_helpers.h |
index 563f99e69afef7790484bd31213d81c46734dd6a..66c3dc92fe9cb76bc85fe5e6e217790ba1303050 100644 |
--- a/chrome/browser/extensions/extension_permissions_api_helpers.h |
+++ b/chrome/browser/extensions/extension_permissions_api_helpers.h |
@@ -8,29 +8,32 @@ |
#include <string> |
-#include "base/memory/ref_counted.h" |
- |
namespace base { |
class DictionaryValue; |
} |
+ |
class ExtensionPermissionSet; |
namespace extensions { |
-namespace permissions_api { |
+namespace api { |
+namespace permissions { |
+struct Permissions; |
+} |
+} |
+ |
+namespace permissions_api_helpers { |
// Converts the permission |set| to a dictionary value. |
base::DictionaryValue* PackPermissionsToValue( |
const ExtensionPermissionSet* set); |
-// Converts the |value| to a permission set. |
-bool UnpackPermissionsFromValue(base::DictionaryValue* value, |
- scoped_refptr<ExtensionPermissionSet>* ptr, |
- bool* bad_message, |
- std::string* error); |
+// Creates a permission set from |permissions|. Returns NULL if the permissions |
+// cannot be converted to a permission set, in which case |error| will be set. |
+ExtensionPermissionSet* UnpackPermissionSet( |
+ const api::permissions::Permissions& permissions, std::string* error); |
} // namespace permissions_api |
- |
} // namespace extensions |
#endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_PERMISSIONS_API_HELPERS_H__ |