MD Settings: Bluetooth: Add error dialog and messages

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

 // Copyright 2015 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-page' is the settings page for managing bluetooth
  *  properties and devices.
  *
  * Example:
@@ skipping 55 matching lines @@
      * The ordered list of bluetooth devices.
      * @type {!Array<!chrome.bluetooth.Device>}
      */
     deviceList: {
       type: Array,
       value: function() { return []; },
     },
 
     /**
      * Set to the name of the dialog to show. This page uses a single
-     * paper-dialog to host one of two dialog elements, 'addDevice' or
-     * 'pairDevice'. This allows a seamless transition between adding and
-     * pairing dialogs. Note: This property should be set before opening the
-     * dialog, and setting the property will not itself cause the dialog to
-     * open.
+     * paper-dialog to host one of three dialog elements, 'addDevice',
+     * 'pairDevice', or 'connectError'. This allows a seamless transition
+     * between dialogs. Note: This property should be set before opening the
+     * dialog and setting the property will not itself cause the dialog to open.
      */
     dialogId: String,
 
     /**
      * Current Pairing device.
      * @type {?chrome.bluetooth.Device|undefined}
      */
     pairingDevice: Object,
 
     /**
      * Current Pairing event.
      * @type {?chrome.bluetoothPrivate.PairingEvent|undefined}
      */
     pairingEvent: Object,
 
+    /** The translated error message to show when a connect error occurs. */
+    errorMessage: String,
+
     /**
      * Interface for bluetooth calls. May be overriden by tests.
      * @type {Bluetooth}
      */
     bluetooth: {
       type: Object,
       value: chrome.bluetooth,
     },
 
     /**
@@ skipping 326 matching lines @@
     // If the device is not paired, show the pairing dialog.
     if (!device.paired) {
       // Set the pairing device and clear any pairing event.
       this.pairingDevice = device;
       this.pairingEvent = null;
 
       this.openDialog_('pairDevice');
     }
 
     this.bluetoothPrivate.connect(device.address, function(result) {
+      var error;
       if (chrome.runtime.lastError) {
-        console.error(
-            'Error connecting: ' + device.address +
-            chrome.runtime.lastError.message);
-        // TODO(stevenjb): Show error message insead.
+        error = chrome.runtime.lastError.message;
+      } else {
+        switch (result) {
+          case chrome.bluetoothPrivate.ConnectResultType.ALREADY_CONNECTED:
+          case chrome.bluetoothPrivate.ConnectResultType.AUTH_CANCELED:
+          case chrome.bluetoothPrivate.ConnectResultType.IN_PROGRESS:
+          case chrome.bluetoothPrivate.ConnectResultType.SUCCESS:
+            break;
+          default:
+            error = result;
+        }
+      }

[Dan Beam, 2016/07/16 00:31:56]

nit: \n after each if

[stevenjb, 2016/07/16 01:17:46]

Presuming you mean a blank line here and after 461, done.

+      if (!error) {
         this.closeDialog_();
+        return;
       }
+      var name = this.getDeviceName_(device);
+      var id = 'bluetooth_connect_' + error;
+      if (this.i18nExists(id))
+        this.errorMessage = this.i18n(id, name);
+      else
+        this.errorMessage = error;
+      console.error('Error connecting to: ' + name + ': ' + this.errorMessage);

[Dan Beam, 2016/07/16 00:31:56]

nit: i still don't support leaving console messaging in our production code...

[stevenjb, 2016/07/16 01:17:46]

Moved the console.error inside the else clause, since that probably shouldn't
happen but might and will be useful for debugging if it does.

One of these days I will add the equivalent of VLOG for JS...

+      this.openDialog_('connectError');
     }.bind(this));
   },
 
   /**
    * @param {!chrome.bluetooth.Device} device
    * @private
    */
   disconnectDevice_: function(device) {
     this.bluetoothPrivate.disconnectAll(device.address, function() {
       if (chrome.runtime.lastError) {
@@ skipping 58 matching lines @@
 
   /** @private */
   onCloseDialog_: function(event) { this.closeDialog_(); },
 
   /** @private */
   onDialogOpened_: function() { this.startDiscovery_(); },
 
   /** @private */
   onDialogClosed_: function() { this.stopDiscovery_(); },
 });