| 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 4bbad21bc7403881576b8bcad61aebd2466c7a3a..e589e216030f703b7a6891cd571f0f4bb65d9016 100644
|
| --- a/extensions/common/api/bluetooth/bluetooth_manifest_permission.h
|
| +++ b/extensions/common/api/bluetooth/bluetooth_manifest_permission.h
|
| @@ -41,18 +41,18 @@ 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 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;
|
| + const override;
|
| virtual ManifestPermission* Union(const ManifestPermission* rhs)
|
| - const OVERRIDE;
|
| + const override;
|
| virtual ManifestPermission* Intersect(const ManifestPermission* rhs)
|
| - const OVERRIDE;
|
| + const override;
|
|
|
| const BluetoothUuidSet& uuids() const {
|
| return uuids_;
|
|
|