| Index: chrome/browser/resources/settings/bluetooth_page/bluetooth_page.js
|
| diff --git a/chrome/browser/resources/settings/bluetooth_page/bluetooth_page.js b/chrome/browser/resources/settings/bluetooth_page/bluetooth_page.js
|
| index b4e35a45fd4096cdd753be104abad3aa71537a2d..01f92f0018f05faf810bb76a60f796f62f9a53b1 100644
|
| --- a/chrome/browser/resources/settings/bluetooth_page/bluetooth_page.js
|
| +++ b/chrome/browser/resources/settings/bluetooth_page/bluetooth_page.js
|
| @@ -383,7 +383,7 @@ Polymer({
|
| ': Response: ' + options.response + ': Error: ' +
|
| chrome.runtime.lastError.message);
|
| }
|
| - this.closeDialog_();
|
| + this.$$('#deviceDialog').close();
|
| }.bind(this));
|
| },
|
|
|
| @@ -457,7 +457,7 @@ Polymer({
|
| }
|
|
|
| if (!error) {
|
| - this.closeDialog_();
|
| + this.$$('#deviceDialog').close();
|
| return;
|
| }
|
|
|
| @@ -529,22 +529,13 @@ Polymer({
|
| },
|
|
|
| /** @private */
|
| - closeDialog_: function() {
|
| - if (!this.dialogId)
|
| - return;
|
| - var dialog = this.$$('#deviceDialog');
|
| - dialog.close();
|
| + onDialogClosed_: function() {
|
| + this.stopDiscovery_();
|
| this.dialogId = '';
|
| this.pairingDevice = null;
|
| this.pairingEvent = null;
|
| },
|
|
|
| /** @private */
|
| - onCloseDialog_: function(event) { this.closeDialog_(); },
|
| -
|
| - /** @private */
|
| onDialogOpened_: function() { this.startDiscovery_(); },
|
| -
|
| - /** @private */
|
| - onDialogClosed_: function() { this.stopDiscovery_(); },
|
| });
|
|
|