Chromium Code Reviews| 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..45508ba82ef016ac091791557244cbed44c474a1 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,15 @@ Polymer({ |
| }, |
| /** @private */ |
| - closeDialog_: function() { |
| + onDialogClosed_: function() { |
| + this.stopDiscovery_(); |
| if (!this.dialogId) |
| return; |
|
stevenjb
2016/07/19 17:21:54
no need for the early exit any more.
dpapad
2016/07/19 17:45:50
Done.
|
| - var dialog = this.$$('#deviceDialog'); |
| - dialog.close(); |
| this.dialogId = ''; |
| this.pairingDevice = null; |
| this.pairingEvent = null; |
| }, |
| /** @private */ |
| - onCloseDialog_: function(event) { this.closeDialog_(); }, |
| - |
| - /** @private */ |
| onDialogOpened_: function() { this.startDiscovery_(); }, |
| - |
| - /** @private */ |
| - onDialogClosed_: function() { this.stopDiscovery_(); }, |
| }); |