| 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..bb0ad5adfb61515d4d2b56aaaa6af91790f5e476 100644
|
| --- a/chrome/browser/extensions/extension_permissions_api_helpers.h
|
| +++ b/chrome/browser/extensions/extension_permissions_api_helpers.h
|
| @@ -8,29 +8,27 @@
|
|
|
| #include <string>
|
|
|
| -#include "base/memory/ref_counted.h"
|
| -
|
| namespace base {
|
| class DictionaryValue;
|
| }
|
| class ExtensionPermissionSet;
|
|
|
| namespace extensions {
|
| -
|
| namespace permissions_api {
|
|
|
| +struct Permissions;
|
| +
|
| // 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);
|
| +// Converts the |permissions| to a new permission set. Returns NULL if the
|
| +// permissions cannot be converted to a permission set, in which case |error|
|
| +// will be set.
|
| +ExtensionPermissionSet* UnpackPermissionSet(
|
| + const Permissions& permissions, std::string* error);
|
|
|
| } // namespace permissions_api
|
| -
|
| } // namespace extensions
|
|
|
| #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_PERMISSIONS_API_HELPERS_H__
|
|
|