| Index: extensions/common/permissions/api_permission.h
|
| diff --git a/extensions/common/permissions/api_permission.h b/extensions/common/permissions/api_permission.h
|
| index 636675666daac6e489b2d6fa6fcdaa6b71764390..ce4e75131a611b80e9ba7b721e2b4f3e7d1d89fc 100644
|
| --- a/extensions/common/permissions/api_permission.h
|
| +++ b/extensions/common/permissions/api_permission.h
|
| @@ -210,8 +210,12 @@ class APIPermission {
|
| virtual bool Equal(const APIPermission* rhs) const = 0;
|
|
|
| // Parses the APIPermission from |value|. Returns false if an error happens
|
| - // and optionally set |error| if |error| is not NULL.
|
| - virtual bool FromValue(const base::Value* value, std::string* error) = 0;
|
| + // and optionally set |error| if |error| is not NULL. If |value| represents
|
| + // multiple permissions, some are invalid, and |unhandled_permissions| is
|
| + // not NULL, the invalid ones are put into |unhandled_permissions| and the
|
| + // function returns true.
|
| + virtual bool FromValue(const base::Value* value, std::string* error,
|
| + std::vector<std::string>* unhandled_permissions) = 0;
|
|
|
| // Stores this into a new created |value|.
|
| virtual scoped_ptr<base::Value> ToValue() const = 0;
|
|
|