bluetooth: Componentize device list in chrome://bluetooth-internals.

chrome/browser/resources/bluetooth_internals/bluetooth_internals.js

Index: chrome/browser/resources/bluetooth_internals/bluetooth_internals.js
diff --git a/chrome/browser/resources/bluetooth_internals/bluetooth_internals.js b/chrome/browser/resources/bluetooth_internals/bluetooth_internals.js
index e32988f1f747927759335f64fca83140a9e058bd..ecb9ca3e90d564865b3c16946126a287601a1a29 100644
--- a/chrome/browser/resources/bluetooth_internals/bluetooth_internals.js
+++ b/chrome/browser/resources/bluetooth_internals/bluetooth_internals.js
@@ -7,142 +7,74 @@
  *     chrome://bluetooth-internals/.
  */
 
-(function() {
-  var adapter, adapterClient, bluetoothAdapter, bluetoothDevice, connection;
-
-  var REMOVED_CSS = 'removed';
-
-  /*
-   * Data model for a cached device.
-   * @constructor
-   * @param {!bluetoothDevice.DeviceInfo} info
-   */
-  var Device = function(info) { this.info = info; };
-
+cr.define('bluetooth_internals', function() {

[scheib, 2016/10/31 20:24:36]

pardon my ignorance, but isn't part of the point of these define modules to list
out the other required components? e.g. device_collection and device_table?

[mbrunson, 2016/10/31 21:46:19]

There's three kinds of defines that I've seen used in WebUI: local module, ui
module, and general module ("cr.define", "cr.ui.define", and just "define",
respectively). cr.define just creates a global variable on the window object.
cr.ui.define creates a class that represents an HTML element. And plain old
define is used to import Mojom file dependencies.

It can be very confusing...

   /**
    * The implementation of AdapterClient in
    *     device/bluetooth/public/interfaces/adapter.mojom. This also manages the
    *     client-side collection of devices.
    * @constructor
    */
-  var AdapterClient = function() { this.devices_ = new Map(); };
+  var AdapterClient = function() {
+    this.devices = new device_collection.DeviceCollection([]);
+  };
   AdapterClient.prototype = {
     /**
-     * Caches the device info and updates the device list.
-     * @param {!bluetoothDevice.DeviceInfo} deviceInfo
+     * Adds a device to the device collection.
+     * @param {!interfaces.BluetoothDevice.DeviceInfo} deviceInfo
      */
     deviceAdded: function(deviceInfo) {
-      if (this.devices_.has(deviceInfo.address)) {
-        var deviceElement = $(deviceInfo.address);
-        deviceElement.classList.remove(REMOVED_CSS);
-      } else {
-        this.devices_.set(deviceInfo.address, new Device(deviceInfo));
-
-        var deviceRowTemplate = $('device-row-template');
-        var deviceRow = document.importNode(
-            deviceRowTemplate.content.children[0], true /* deep */);
-        deviceRow.id = deviceInfo.address;
-
-        var deviceList = $('device-list');
-        deviceList.appendChild(deviceRow);
-      }
-
-      this.deviceChanged(deviceInfo);
+      this.devices.addOrUpdate(deviceInfo);
     },
 
     /**
      * Marks device as removed.
-     * @param {!bluetoothDevice.DeviceInfo} deviceInfo
+     * @param {!interfaces.BluetoothDevice.DeviceInfo} deviceInfo
      */
     deviceRemoved: function(deviceInfo) {
-      $(deviceInfo.address).classList.add(REMOVED_CSS);
+      this.devices.remove(deviceInfo);
     },
 
     /**
-     * Updates cached device and updates the device list.
-     * @param {!bluetoothDevice.DeviceInfo} deviceInfo
+     * Updates the cached device.
+     * @param {!interfaces.BluetoothDevice.DeviceInfo} deviceInfo
      */
     deviceChanged: function(deviceInfo) {
       console.log(new Date(), deviceInfo);
-
-      assert(this.devices_.has(deviceInfo.address), 'Device does not exist.');
-
-      this.devices_.get(deviceInfo.address).info = deviceInfo;
-
-      var deviceRow = $(deviceInfo.address);
-      deviceRow.querySelector('.device-name').textContent =
-          deviceInfo.name_for_display;
-      deviceRow.querySelector('.device-address').textContent =
-          deviceInfo.address;
-
-      var rssi = (deviceInfo.rssi && deviceInfo.rssi.value) ||
-          deviceRow.querySelector('.device-rssi').textContent;
-      deviceRow.querySelector('.device-rssi').textContent = rssi;
+      this.devices.addOrUpdate(deviceInfo);
     }
   };
 
-  /**
-   * TODO(crbug.com/652361): Move to shared location.
-   * Helper to convert callback-based define() API to a promise-based API.
-   * @param {!Array<string>} moduleNames
-   * @return {!Promise}
-   */
-  function importModules(moduleNames) {
-    return new Promise(function(resolve, reject) {
-      define(moduleNames, function(var_args) {
-        resolve(Array.prototype.slice.call(arguments, 0));
-      });
-    });
-  }
+  var adapterClient = null;
 
-  /**
-   * Initializes Mojo proxies for page and Bluetooth services.
-   * @return {!Promise} resolves if adapter is acquired, rejects if Bluetooth
-   *     is not supported.
-   */
-  function initializeProxies() {
-    return importModules([
-      'content/public/renderer/frame_interfaces',
-      'device/bluetooth/public/interfaces/adapter.mojom',
-      'device/bluetooth/public/interfaces/device.mojom',
-      'mojo/public/js/connection',
-    ]).then(function([frameInterfaces, ...modules]) {
-      // Destructure here to assign global variables.
-      [bluetoothAdapter, bluetoothDevice, connection] = modules;
-
-      // Hook up the instance properties.
-      AdapterClient.prototype.__proto__ =
-          bluetoothAdapter.AdapterClient.stubClass.prototype;
-
-      var adapterFactory = connection.bindHandleToProxy(
-          frameInterfaces.getInterface(bluetoothAdapter.AdapterFactory.name),
-          bluetoothAdapter.AdapterFactory);
-
-      // Get an Adapter service.
-      return adapterFactory.getAdapter();
-    }).then(function(response) {
-      if (!response.adapter) {
-        throw new Error('Bluetooth Not Supported on this platform.');
-      }
-
-      adapter = connection.bindHandleToProxy(response.adapter,
-                                             bluetoothAdapter.Adapter);
-
-      // Create a message pipe and bind one end to client
-      // implementation and the other to the Adapter service.
-      adapterClient = new AdapterClient();
-      adapter.setClient(connection.bindStubDerivedImpl(adapterClient));
-    });
-  }
+  function initialize() {
+    interfaces.initialize()
+      .then(function() {
+        // Hook up the instance properties.
+        AdapterClient.prototype.__proto__ =
+            interfaces.BluetoothAdapter.AdapterClient.stubClass.prototype;
 
-  document.addEventListener('DOMContentLoaded', function() {
-    initializeProxies()
+        adapterClient = new AdapterClient();
+        interfaces.DefaultAdapter.setClient(
+            interfaces.Connection.bindStubDerivedImpl(adapterClient));
+      })
       .then(function() { return adapter.getInfo(); })
       .then(function(response) { console.log('adapter', response.info); })
       .then(function() { return adapter.getDevices(); })
       .then(function(response) {
-        response.devices.forEach(adapterClient.deviceAdded, adapterClient);
+        response.devices.forEach(adapterClient.deviceAdded,
+                                 adapterClient /** this */);
+
+        var deviceTable = new device_table.DeviceTable();
+        deviceTable.setDevices(adapterClient.devices);
+        document.body.appendChild(deviceTable);
       })
       .catch(function(error) { console.error(error); });
-  });
-})();
+  }
+
+  return {
+    initialize: initialize
+  };
+
+});
+
+document.addEventListener('DOMContentLoaded', bluetooth_internals.initialize);