Index: chrome/browser/resources/cryptotoken/usbgnubbydevice.js |
diff --git a/chrome/browser/resources/cryptotoken/usbgnubbydevice.js b/chrome/browser/resources/cryptotoken/usbgnubbydevice.js |
index 09b3909f91580a26157df46516f7ebcd6cd8868a..089ca1543ba3c67fbf643d82f4417459f5dd59d0 100644 |
--- a/chrome/browser/resources/cryptotoken/usbgnubbydevice.js |
+++ b/chrome/browser/resources/cryptotoken/usbgnubbydevice.js |
@@ -374,26 +374,29 @@ UsbGnubbyDevice.prototype.queueCommand = function(cid, cmd, data) { |
}; |
/** |
+ * @const |
+ */ |
+UsbGnubbyDevice.WINUSB_VID_PIDS = [ |
+ {'vendorId': 4176, 'productId': 529} // Yubico WinUSB |
+]; |
+ |
+/** |
* @param {function(Array)} cb Enumerate callback |
*/ |
UsbGnubbyDevice.enumerate = function(cb) { |
- var permittedDevs; |
var numEnumerated = 0; |
var allDevs = []; |
function enumerated(devs) { |
allDevs = allDevs.concat(devs); |
- if (++numEnumerated == permittedDevs.length) { |
+ if (++numEnumerated == UsbGnubbyDevice.WINUSB_VID_PIDS.length) { |
cb(allDevs); |
} |
} |
- GnubbyDevice.getPermittedUsbDevices(function(devs) { |
- permittedDevs = devs; |
- for (var i = 0; i < devs.length; i++) { |
- chrome.usb.getDevices(devs[i], enumerated); |
- } |
- }); |
+ for (var i = 0; i < UsbGnubbyDevice.WINUSB_VID_PIDS.length; i++) { |
+ chrome.usb.getDevices(UsbGnubbyDevice.WINUSB_VID_PIDS[i], enumerated); |
+ } |
}; |
/** |