| Index: extensions/common/api/bluetooth/bluetooth_manifest_permission.h
|
| diff --git a/extensions/common/api/bluetooth/bluetooth_manifest_permission.h b/extensions/common/api/bluetooth/bluetooth_manifest_permission.h
|
| index e589e216030f703b7a6891cd571f0f4bb65d9016..eb71fa4be8c78ef1c325fd975a42c1454f9ee057 100644
|
| --- a/extensions/common/api/bluetooth/bluetooth_manifest_permission.h
|
| +++ b/extensions/common/api/bluetooth/bluetooth_manifest_permission.h
|
| @@ -25,7 +25,7 @@ class BluetoothManifestPermission : public ManifestPermission {
|
| public:
|
| typedef std::set<std::string> BluetoothUuidSet;
|
| BluetoothManifestPermission();
|
| - virtual ~BluetoothManifestPermission();
|
| + ~BluetoothManifestPermission() 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.
|
| @@ -41,18 +41,15 @@ class BluetoothManifestPermission : public ManifestPermission {
|
| void AddPermission(const std::string& uuid);
|
|
|
| // 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 BluetoothUuidSet& uuids() const {
|
| return uuids_;
|
|
|