MD Settings: combine title and ways of closing Bluetooth device dialog

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

 // 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.
 
 cr.exportPath('settings');
 
 (function() {
 
 var PairingEventType = chrome.bluetoothPrivate.PairingEventType;
 
@@ skipping 47 matching lines @@
   },
 
   /**
    * @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'); },
 };
 
 /** @polymerBehavior */
 settings.BluetoothPairDeviceBehavior = {
   properties: {
     /**
      * Current Pairing device.
      * @type {?chrome.bluetooth.Device|undefined}
      */
     pairingDevice: Object,
@@ skipping 134 matching lines @@
   onConnectTap_: function() {
     this.sendResponse_(chrome.bluetoothPrivate.PairingResponse.CONFIRM);
   },
 
   /** @private */
   onRejectTap_: function() {
     this.sendResponse_(chrome.bluetoothPrivate.PairingResponse.REJECT);
   },
 
   /** @private */
-  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) {
     if (!this.pairingDevice)
       return;
     var options =
         /** @type {!chrome.bluetoothPrivate.SetPairingResponseOptions} */ {
           device: this.pairingDevice,
           response: response
@@ skipping 87 matching lines @@
     settings.BluetoothAddDeviceBehavior,
     settings.BluetoothPairDeviceBehavior,
   ],
 
   properties: {
     /** Which version of this dialog to show (adding or pairing). */
     dialogType: String,
   },
 
   /**
+   * @param {string} dialogType
+   * @return {string} The title of for that |dialogType|.
+   */
+  getTitle_: function(dialogType) {
+    return this.i18n(dialogType == 'addDevice' ?
+        'bluetoothAddDevicePageTitle' : 'bluetoothPairDevicePageTitle');
+  },
+
+  /**
    * @param {string} currentDialogType
    * @param {string} wantedDialogType
    * @return {boolean}
    * @private
    */
   isDialogType_: function(currentDialogType, wantedDialogType) {
     return currentDialogType == wantedDialogType;
   },
 
+  /** @private */
+  onCancelTap_: function() {
+    // NOTE: tapping on an element with [dialog-dismiss] doesn't trigger an
+    // iron-overlay-cancel event, whereas tapping (X) or pressing Esc does.
+    // Using cancel() ensures all 3 ways to close the dialog run the same code.
+    this.$.dialog.cancel();
+  },
+
+  /** @private */
+  onIronOverlayCanceled_: function() {
+    if (this.dialogType == 'pairDevice')
+      this.sendResponse_(chrome.bluetoothPrivate.PairingResponse.CANCEL);
+  },
+
+  /** @private */
+  onIronOverlayClosed_: function() {
+    this.fire('close-dialog', '');
+  },
+
   open: function() {
     this.$.dialog.open();
   },
 
   close: function() {
     this.$.dialog.close();
   },
 });
 
 })();