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

Unified Diff: chrome/browser/devtools/adb/android_usb_device.cc

Issue 18593002: Usb backend refactor step 2: Separate Usb Device Handle and Usb Device (deprecate) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Separate Usb Device Handle and Usb Device Created 7 years, 5 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
« no previous file with comments | « no previous file | chrome/browser/extensions/api/usb/usb_api.h » ('j') | chrome/browser/usb/usb_device.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/devtools/adb/android_usb_device.cc
diff --git a/chrome/browser/devtools/adb/android_usb_device.cc b/chrome/browser/devtools/adb/android_usb_device.cc
index 17ae407eaeb4647e65b59877d4ad4f06f17cc67e..5e6ff71f2dcf8532e37672877ece4c0785d4144c 100644
--- a/chrome/browser/devtools/adb/android_usb_device.cc
+++ b/chrome/browser/devtools/adb/android_usb_device.cc
@@ -203,11 +203,11 @@ void AndroidUsbDevice::Enumerate(Profile* profile, Devices* devices) {
UsbServiceFactory::GetInstance()->GetForProfile(profile);
// Enumerate usb devices.
- std::vector<scoped_refptr<UsbDevice> > usb_devices;
- service->EnumerateDevices(&usb_devices);
+ std::vector<int> usb_devices;
+ service->GetDevices(&usb_devices);
for (size_t i = 0; i < usb_devices.size(); ++i) {
- scoped_refptr<UsbDevice> usb_device = usb_devices[i];
-
+ int usb_device_id = usb_devices[i];
+ scoped_refptr<UsbDevice> usb_device = service->OpenDevice(usb_device_id);
// Enumerate device interfaces.
scoped_refptr<UsbConfigDescriptor> config = new UsbConfigDescriptor();
usb_device->ListInterfaces(config.get(), base::Bind(&BoolNoop));
« no previous file with comments | « no previous file | chrome/browser/extensions/api/usb/usb_api.h » ('j') | chrome/browser/usb/usb_device.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698