MD Settings: combine bluetooth adding and pairing dialogs into one

chrome/browser/resources/settings/bluetooth_page/bluetooth_device_dialog.js

-// Copyright 2015 The Chromium Authors. All rights reserved.
+// Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-/**
- * @fileoverview
- * 'settings-bluetooth-pair-device-dialog' is the settings dialog for pairing
- * a bluetooth device.
- */
-
 (function() {
 
 var PairingEventType = chrome.bluetoothPrivate.PairingEventType;
 
 Polymer({
-  is: 'settings-bluetooth-pair-device-dialog',
+  is: 'bluetooth-device-dialog',
 
   behaviors: [I18nBehavior],
 
   properties: {
+    /** Which version of this dialog to show (adding or pairing). */
+    dialog: String,

[stevenjb, 2016/05/09 16:58:10]

I was confused by |dialog| in the html, maybe dialogType?

[Dan Beam, 2016/05/10 23:55:22]

Done.

+
+// ================================== Add ======================================

[stevenjb, 2016/05/09 16:58:10]

The necessity of these comments for readability suggests to me that we should
move the add / pair logic to behaviors and just inlcude those behaviors here.

[Dan Beam, 2016/05/10 23:55:22]

Done.

+    /**
+     * The cached bluetooth adapter state.
+     * @type {!chrome.bluetooth.AdapterState|undefined}
+     */
+    adapterState: {
+      type: Object,
+      observer: 'adapterStateChanged_',
+    },
+
+    /**
+     * The ordered list of bluetooth devices.
+     * @type {!Array<!chrome.bluetooth.Device>}
+     */
+    deviceList: {
+      type: Array,
+      value: function() { return []; },
+    },
+
+// ================================= Pair ======================================
     /**
      * Current Pairing device.
      * @type {?chrome.bluetooth.Device|undefined}
      */
     pairingDevice: Object,
 
     /**
      * Current Pairing event.
      * @type {?chrome.bluetoothPrivate.PairingEvent|undefined}
      */
     pairingEvent: Object,
 
     /**
      * @const
      * @type {!Array<number>}
      */
     digits: {
       type: Array,
       readOnly: true,
       value: [0, 1, 2, 3, 4, 5],
     },
   },
 
   observers: [
     'pairingChanged_(pairingDevice, pairingEvent)',
   ],
+// =============================================================================
 
   /**
+   * @return {boolean}
+   * @private
+   */
+  isDialog_: function(currentDialog, wantedDialog) {

[stevenjb, 2016/05/09 16:58:10]

Types for num-member args?

[Dan Beam, 2016/05/10 23:55:22]

Done.

+    return currentDialog == wantedDialog;
+  },
+
+  open: function() {
+    this.$.dialog.open();
+  },
+
+  close: function() {
+    this.$.dialog.close();
+  },
+
+// ================================== Add ======================================
+  /** @private */
+  adapterStateChanged_: function() {
+    if (!this.adapterState.powered)
+      this.fire('close-dialog');
+  },
+
+  /**
+   * @param {!chrome.bluetooth.Device} device
+   * @return {boolean}
+   * @private
+   */
+  deviceNotPaired_: function(device) {
+    return !device.paired;
+  },
+
+  /**
+   * @param {!Array<!chrome.bluetooth.Device>} deviceList
+   * @return {boolean} True if deviceList contains any unpaired devices.
+   * @private
+   */
+  haveDevices_: function(deviceList) {
+    return this.deviceList.findIndex(function(d) { return !d.paired; }) != -1;
+  },
+
+  /**
+   * @param {!{detail: {action: string, device: !chrome.bluetooth.Device}}} e
+   * @private
+   */
+  onDeviceEvent_: function(e) {
+    this.fire('device-event', e.detail);
+    /** @type {Event} */(e).stopPropagation();
+  },
+
+  /** @private */
+  onAddCancelTap_: function() { this.fire('close-dialog'); },
+
+// ================================= Pair ======================================
+  /**
    * @param {?chrome.bluetooth.Device} pairingDevice
    * @param {?chrome.bluetoothPrivate.PairingEvent} pairingEvent
    * @private
    */
   pairingChanged_: function(pairingDevice, pairingEvent) {
     // Auto-close the dialog when pairing completes.
     if (pairingDevice && pairingDevice.connected) {
       this.fire('close-dialog', '');
       return;
     }
@@ skipping 101 matching lines @@
   onConnectTap_: function() {
     this.sendResponse_(chrome.bluetoothPrivate.PairingResponse.CONFIRM);
   },
 
   /** @private */
   onRejectTap_: function() {
     this.sendResponse_(chrome.bluetoothPrivate.PairingResponse.REJECT);
   },
 
   /** @private */
-  onCancelTap_: function() {
+  onPairCancelTap_: function() {
     this.sendResponse_(chrome.bluetoothPrivate.PairingResponse.CANCEL);
     // Close the dialog immediately.
     this.fire('close-dialog', '');
   },
 
   /** @private */
   onDismissTap_: function() { this.fire('close-dialog', ''); },
 
   /** @private */
   sendResponse_: function(response) {
@@ skipping 77 matching lines @@
       var enteredKey = pairingEvent.enteredKey;  // 1-7
       var lastKey = this.digits.length;  // 6
       if ((index == -1 && enteredKey > lastKey) || (index + 1 == enteredKey))
         cssClass += ' next';
       else if (index > enteredKey)
         cssClass += ' untyped';
     }
     return cssClass;
   },
 });
+
 })();