| 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 15b2044a1e126d024530cd3df8e6f68c6e9a523f..d636f224294489d8171c50f8c78be005a93151f2 100644
|
| --- a/extensions/common/api/sockets/sockets_manifest_permission.h
|
| +++ b/extensions/common/api/sockets/sockets_manifest_permission.h
|
| @@ -26,7 +26,7 @@ class SocketsManifestPermission : public ManifestPermission {
|
| public:
|
| typedef std::set<SocketPermissionEntry> SocketPermissionEntrySet;
|
| SocketsManifestPermission();
|
| - virtual ~SocketsManifestPermission();
|
| + ~SocketsManifestPermission() override;
|
|
|
| // Tries to construct the info based on |value|, as it would have appeared in
|
| // the manifest. Sets |error| and returns an empty scoped_ptr on failure.
|
| @@ -40,18 +40,15 @@ 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 ManifestPermission* Diff(const ManifestPermission* rhs) const
|
| - override;
|
| - virtual ManifestPermission* Union(const ManifestPermission* rhs) const
|
| - override;
|
| - virtual ManifestPermission* Intersect(const ManifestPermission* rhs) const
|
| - override;
|
| + std::string name() const override;
|
| + std::string id() const override;
|
| + bool HasMessages() const override;
|
| + PermissionMessages GetMessages() const override;
|
| + bool FromValue(const base::Value* value) override;
|
| + scoped_ptr<base::Value> ToValue() const override;
|
| + ManifestPermission* Diff(const ManifestPermission* rhs) const override;
|
| + ManifestPermission* Union(const ManifestPermission* rhs) const override;
|
| + ManifestPermission* Intersect(const ManifestPermission* rhs) const override;
|
|
|
| const SocketPermissionEntrySet& entries() const { return permissions_; }
|
|
|
|
|