| Index: extensions/common/api/sockets/sockets_manifest_permission.h
|
| diff --git a/extensions/common/api/sockets/sockets_manifest_permission.h b/extensions/common/api/sockets/sockets_manifest_permission.h
|
| index 8aa8be20dd8930f8c7fef8ae095b57c5dc922137..15b2044a1e126d024530cd3df8e6f68c6e9a523f 100644
|
| --- a/extensions/common/api/sockets/sockets_manifest_permission.h
|
| +++ b/extensions/common/api/sockets/sockets_manifest_permission.h
|
| @@ -40,18 +40,18 @@ class SocketsManifestPermission : public ManifestPermission {
|
| void AddPermission(const SocketPermissionEntry& entry);
|
|
|
| // extensions::ManifestPermission overrides.
|
| - virtual std::string name() const OVERRIDE;
|
| - virtual std::string id() const OVERRIDE;
|
| - virtual bool HasMessages() const OVERRIDE;
|
| - virtual PermissionMessages GetMessages() const OVERRIDE;
|
| - virtual bool FromValue(const base::Value* value) OVERRIDE;
|
| - virtual scoped_ptr<base::Value> ToValue() const OVERRIDE;
|
| + virtual std::string name() const override;
|
| + virtual std::string id() const override;
|
| + virtual bool HasMessages() const override;
|
| + virtual PermissionMessages GetMessages() const override;
|
| + virtual bool FromValue(const base::Value* value) override;
|
| + virtual scoped_ptr<base::Value> ToValue() const override;
|
| virtual ManifestPermission* Diff(const ManifestPermission* rhs) const
|
| - OVERRIDE;
|
| + override;
|
| virtual ManifestPermission* Union(const ManifestPermission* rhs) const
|
| - OVERRIDE;
|
| + override;
|
| virtual ManifestPermission* Intersect(const ManifestPermission* rhs) const
|
| - OVERRIDE;
|
| + override;
|
|
|
| const SocketPermissionEntrySet& entries() const { return permissions_; }
|
|
|
|
|