Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4115)

Unified Diff: chrome/browser/resources/options/chromeos/bluetooth_add_device_overlay.js

Issue 184953002: Migrate Chrome OS Bluetooth UI to the new discovery API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/options/chromeos/bluetooth_add_device_overlay.js
diff --git a/chrome/browser/resources/options/chromeos/bluetooth_add_device_overlay.js b/chrome/browser/resources/options/chromeos/bluetooth_add_device_overlay.js
index 3b076a1f26fb42e79028bd965ffc7db1a1b03073..4bc7f6cda75e0bc256013b44d90015c97ed73f49 100644
--- a/chrome/browser/resources/options/chromeos/bluetooth_add_device_overlay.js
+++ b/chrome/browser/resources/options/chromeos/bluetooth_add_device_overlay.js
@@ -34,7 +34,6 @@ cr.define('options', function() {
this.createDeviceList_();
$('bluetooth-add-device-cancel-button').onclick = function(event) {
- chrome.send('stopBluetoothDeviceDiscovery');
OptionsPage.closeOverlay();
};
@@ -42,7 +41,6 @@ cr.define('options', function() {
$('bluetooth-add-device-apply-button').onclick = function(event) {
var device = self.deviceList_.selectedItem;
var address = device.address;
- chrome.send('stopBluetoothDeviceDiscovery');
OptionsPage.closeOverlay();
keybuk 2014/02/28 21:29:28 While this looks like it closes the overlay, it im
xiyuan 2014/02/28 22:21:25 This is probably okay. Pairing and this add device
device.pairing = 'bluetoothStartConnecting';
options.BluetoothPairing.showDialog(device);
@@ -68,6 +66,11 @@ cr.define('options', function() {
});
},
+ /** @override */
+ didClosePage: function() {
+ chrome.send('stopBluetoothDeviceDiscovery');
+ },
+
/**
* Creates, decorates and initializes the bluetooth device list.
* @private

Powered by Google App Engine
This is Rietveld 408576698