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

Unified Diff: chrome/browser/resources/bluetooth_internals/service_list.js

Issue 2640073004: bluetooth: Add descriptor list to DeviceDetailsPage on internals page. (Closed)
Patch Set: Fix merge issue of bluetooth_internals.css Created 3 years, 11 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/bluetooth_internals/service_list.js
diff --git a/chrome/browser/resources/bluetooth_internals/service_list.js b/chrome/browser/resources/bluetooth_internals/service_list.js
index 2fce378cfd035f1c530746c675515b7ac1278bf9..0512e54aebc62d4f4efcb82ad82fd49ee394d240 100644
--- a/chrome/browser/resources/bluetooth_internals/service_list.js
+++ b/chrome/browser/resources/bluetooth_internals/service_list.js
@@ -38,10 +38,12 @@ cr.define('service_list', function() {
var listItem = new ExpandableListItem();
listItem.__proto__ = ServiceListItem.prototype;
+ /** @type {!interfaces.BluetoothDevice.ServiceInfo} */
listItem.info = serviceInfo;
+ /** @private {string} */
listItem.deviceAddress_ = deviceAddress;
- listItem.decorate();
+ listItem.decorate();
return listItem;
}
@@ -139,7 +141,7 @@ cr.define('service_list', function() {
* @param {string} deviceAddress
*/
load: function(deviceAddress) {
- if (this.servicesRequested_ || !this.isLoading())
+ if (this.servicesRequested_ || !this.isSpinnerShowing())
return;
this.deviceAddress_ = deviceAddress;
@@ -150,7 +152,7 @@ cr.define('service_list', function() {
return device.getServices();
}.bind(this)).then(function(response) {
this.setData(new ArrayDataModel(response.services));
- this.setLoading(false);
+ this.setSpinnerShowing(false);
this.servicesRequested_ = false;
}.bind(this)).catch(function(error) {
this.servicesRequested_ = false;

Powered by Google App Engine
This is Rietveld 408576698