| Index: extensions/common/permissions/settings_override_permission.h
|
| diff --git a/extensions/common/permissions/settings_override_permission.h b/extensions/common/permissions/settings_override_permission.h
|
| index 48d3d71a74070886aa574f327be5a98728e96f6f..206595382fac868936cff44bd7c65b12a4fe1a51 100644
|
| --- a/extensions/common/permissions/settings_override_permission.h
|
| +++ b/extensions/common/permissions/settings_override_permission.h
|
| @@ -25,7 +25,10 @@ class SettingsOverrideAPIPermission : public APIPermission {
|
| virtual bool Check(const APIPermission::CheckParam* param) const OVERRIDE;
|
| virtual bool Contains(const APIPermission* rhs) const OVERRIDE;
|
| virtual bool Equal(const APIPermission* rhs) const OVERRIDE;
|
| - virtual bool FromValue(const base::Value* value, std::string* error) OVERRIDE;
|
| + virtual bool FromValue(
|
| + const base::Value* value,
|
| + std::string* error,
|
| + std::vector<std::string>* unhandled_permissions) OVERRIDE;
|
| virtual scoped_ptr<base::Value> ToValue() const OVERRIDE;
|
| virtual APIPermission* Clone() const OVERRIDE;
|
| virtual APIPermission* Diff(const APIPermission* rhs) const OVERRIDE;
|
|
|