Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1774)

Unified Diff: chrome/browser/resources/bluetooth_internals/adapter_broker.js

Issue 2590393002: Revert of Mojo JS bindings: switch most usage of "connection"/"router" module to "bindings". (Closed)
Patch Set: Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/resources/bluetooth_internals/bluetooth_internals.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..c1cf8fa37bfb197afde1599b4a62d16f0f9f0923 100644
--- a/chrome/browser/resources/bluetooth_internals/adapter_broker.js
+++ b/chrome/browser/resources/bluetooth_internals/adapter_broker.js
@@ -15,7 +15,7 @@
* handles and back when necessary.
* @constructor
* @extends {cr.EventTarget}
- * @param {!interfaces.BluetoothAdapter.AdapterPtr} adapter
+ * @param {!interfaces.BluetoothAdapter.Adapter.proxyClass} adapter
*/
var AdapterBroker = function(adapter) {
this.adapter_ = adapter;
@@ -29,7 +29,7 @@
/**
* Creates a GATT connection to the device with |address|.
* @param {string} address
- * @return {!Promise<!interfaces.BluetoothDevice.DevicePtr>}
+ * @return {!Promise<!interfaces.BluetoothDevice.Device.proxyClass>}
*/
connectToDevice: function(address) {
return this.adapter_.connectToDevice(address).then(function(response) {
@@ -45,7 +45,9 @@
throw new Error(errorString);
}
- return response.device;
+ return interfaces.Connection.bindHandleToProxy(
+ response.device.ptr.passInterface().handle,
+ interfaces.BluetoothDevice.Device);
});
},
@@ -143,9 +145,14 @@
if (adapterBroker) return Promise.resolve(adapterBroker);
return interfaces.setupInterfaces().then(function(adapter) {
- var adapterFactory = new interfaces.BluetoothAdapter.AdapterFactoryPtr(
+ // Hook up the instance properties.
+ AdapterClient.prototype.__proto__ =
+ interfaces.BluetoothAdapter.AdapterClient.stubClass.prototype;
+
+ var adapterFactory = interfaces.Connection.bindHandleToProxy(
interfaces.FrameInterfaces.getInterface(
- interfaces.BluetoothAdapter.AdapterFactory.name));
+ interfaces.BluetoothAdapter.AdapterFactory.name),
+ interfaces.BluetoothAdapter.AdapterFactory);
// Get an Adapter service.
return adapterFactory.getAdapter();
@@ -154,7 +161,11 @@
throw new Error('Bluetooth Not Supported on this platform.');
}
- adapterBroker = new AdapterBroker(response.adapter);
+ var adapter = interfaces.Connection.bindHandleToProxy(
+ response.adapter.ptr.passInterface().handle,
+ interfaces.BluetoothAdapter.Adapter);
+
+ adapterBroker = new AdapterBroker(adapter);
return adapterBroker;
});
}
« no previous file with comments | « no previous file | chrome/browser/resources/bluetooth_internals/bluetooth_internals.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698