| Index: chrome/browser/resources/bluetooth_internals/adapter_broker.js
|
| diff --git a/chrome/browser/resources/bluetooth_internals/adapter_broker.js b/chrome/browser/resources/bluetooth_internals/adapter_broker.js
|
| index 13a8eee88c2dda0526287ea5c59a44f8453138a7..11eef0bb68f5d350a741a207adfd249e3b4b2a87 100644
|
| --- a/chrome/browser/resources/bluetooth_internals/adapter_broker.js
|
| +++ b/chrome/browser/resources/bluetooth_internals/adapter_broker.js
|
| @@ -55,8 +55,7 @@ cr.define('adapter_broker', function() {
|
| */
|
| setClient: function(adapterClient) {
|
| adapterClient.binding = new interfaces.Bindings.Binding(
|
| - interfaces.BluetoothAdapter.AdapterClient,
|
| - adapterClient);
|
| + interfaces.BluetoothAdapter.AdapterClient, adapterClient);
|
|
|
| this.adapter_.setClient(
|
| adapterClient.binding.createInterfacePtrAndBind());
|
| @@ -97,11 +96,8 @@ cr.define('adapter_broker', function() {
|
| * @param {!interfaces.BluetoothDevice.DeviceInfo} deviceInfo
|
| */
|
| deviceAdded: function(deviceInfo) {
|
| - var event = new CustomEvent('deviceadded', {
|
| - detail: {
|
| - deviceInfo: deviceInfo
|
| - }
|
| - });
|
| + var event =
|
| + new CustomEvent('deviceadded', {detail: {deviceInfo: deviceInfo}});
|
| this.adapterBroker_.dispatchEvent(event);
|
| },
|
|
|
| @@ -110,11 +106,8 @@ cr.define('adapter_broker', function() {
|
| * @param {!interfaces.BluetoothDevice.DeviceInfo} deviceInfo
|
| */
|
| deviceRemoved: function(deviceInfo) {
|
| - var event = new CustomEvent('deviceremoved', {
|
| - detail: {
|
| - deviceInfo: deviceInfo
|
| - }
|
| - });
|
| + var event =
|
| + new CustomEvent('deviceremoved', {detail: {deviceInfo: deviceInfo}});
|
| this.adapterBroker_.dispatchEvent(event);
|
| },
|
|
|
| @@ -123,11 +116,8 @@ cr.define('adapter_broker', function() {
|
| * @param {!interfaces.BluetoothDevice.DeviceInfo} deviceInfo
|
| */
|
| deviceChanged: function(deviceInfo) {
|
| - var event = new CustomEvent('devicechanged', {
|
| - detail: {
|
| - deviceInfo: deviceInfo
|
| - }
|
| - });
|
| + var event =
|
| + new CustomEvent('devicechanged', {detail: {deviceInfo: deviceInfo}});
|
| this.adapterBroker_.dispatchEvent(event);
|
| }
|
| };
|
| @@ -140,23 +130,27 @@ cr.define('adapter_broker', function() {
|
| * rejects if Bluetooth is not supported.
|
| */
|
| function getAdapterBroker() {
|
| - if (adapterBroker) return Promise.resolve(adapterBroker);
|
| -
|
| - return interfaces.setupInterfaces().then(function(adapter) {
|
| - var adapterFactory = new interfaces.BluetoothAdapter.AdapterFactoryPtr(
|
| - interfaces.FrameInterfaces.getInterface(
|
| - interfaces.BluetoothAdapter.AdapterFactory.name));
|
| -
|
| - // Get an Adapter service.
|
| - return adapterFactory.getAdapter();
|
| - }).then(function(response) {
|
| - if (!response.adapter.ptr.isBound()) {
|
| - throw new Error('Bluetooth Not Supported on this platform.');
|
| - }
|
| -
|
| - adapterBroker = new AdapterBroker(response.adapter);
|
| - return adapterBroker;
|
| - });
|
| + if (adapterBroker)
|
| + return Promise.resolve(adapterBroker);
|
| +
|
| + return interfaces.setupInterfaces()
|
| + .then(function(adapter) {
|
| + var adapterFactory =
|
| + new interfaces.BluetoothAdapter.AdapterFactoryPtr(
|
| + interfaces.FrameInterfaces.getInterface(
|
| + interfaces.BluetoothAdapter.AdapterFactory.name));
|
| +
|
| + // Get an Adapter service.
|
| + return adapterFactory.getAdapter();
|
| + })
|
| + .then(function(response) {
|
| + if (!response.adapter.ptr.isBound()) {
|
| + throw new Error('Bluetooth Not Supported on this platform.');
|
| + }
|
| +
|
| + adapterBroker = new AdapterBroker(response.adapter);
|
| + return adapterBroker;
|
| + });
|
| }
|
|
|
| return {
|
|
|