Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / chrome / common / extensions / permissions / settings_override_permission.h

diff --git a/src/chrome/common/extensions/permissions/settings_override_permission.h b/src/chrome/common/extensions/permissions/settings_override_permission.h
index 8f8a4e3..d123f83 100644 (file)
--- a/src/chrome/common/extensions/permissions/settings_override_permission.h
+++ b/src/chrome/common/extensions/permissions/settings_override_permission.h
@@ -25,7 +25,7 @@ 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) OVERRIDE;
+  virtual bool FromValue(const base::Value* value, std::string* error) OVERRIDE;
   virtual scoped_ptr<base::Value> ToValue() const OVERRIDE;
   virtual APIPermission* Clone() const OVERRIDE;
   virtual APIPermission* Diff(const APIPermission* rhs) const OVERRIDE;