| Index: chrome/common/extensions/api/bluetooth/bluetooth_manifest_permission.cc
|
| diff --git a/chrome/common/extensions/api/bluetooth/bluetooth_manifest_permission.cc b/chrome/common/extensions/api/bluetooth/bluetooth_manifest_permission.cc
|
| index c5ead3c52a083df49a099e71762512a5e0a8b24a..2d6670d4ea80fdcf2337a112d6bfcd88e9f1e46d 100644
|
| --- a/chrome/common/extensions/api/bluetooth/bluetooth_manifest_permission.cc
|
| +++ b/chrome/common/extensions/api/bluetooth/bluetooth_manifest_permission.cc
|
| @@ -56,7 +56,9 @@ bool ParseUuidArray(BluetoothManifestPermission* permission,
|
|
|
| } // namespace
|
|
|
| -BluetoothManifestPermission::BluetoothManifestPermission() {}
|
| +BluetoothManifestPermission::BluetoothManifestPermission()
|
| + : socket_(false),
|
| + low_energy_(false) {}
|
|
|
| BluetoothManifestPermission::~BluetoothManifestPermission() {}
|
|
|
| @@ -76,6 +78,12 @@ scoped_ptr<BluetoothManifestPermission> BluetoothManifestPermission::FromValue(
|
| return scoped_ptr<BluetoothManifestPermission>();
|
| }
|
| }
|
| + if (bluetooth->socket) {
|
| + result->socket_ = *(bluetooth->socket);
|
| + }
|
| + if (bluetooth->low_energy) {
|
| + result->low_energy_ = *(bluetooth->low_energy);
|
| + }
|
| return result.Pass();
|
| }
|
|
|
| @@ -94,6 +102,16 @@ bool BluetoothManifestPermission::CheckRequest(
|
| return false;
|
| }
|
|
|
| +bool BluetoothManifestPermission::CheckSocketPermitted(
|
| + const Extension* extension) const {
|
| + return socket_;
|
| +}
|
| +
|
| +bool BluetoothManifestPermission::CheckLowEnergyPermitted(
|
| + const Extension* extension) const {
|
| + return low_energy_;
|
| +}
|
| +
|
| std::string BluetoothManifestPermission::name() const {
|
| return manifest_keys::kBluetooth;
|
| }
|
|
|