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

Unified Diff: device/usb/usb_device_handle_impl.h

Issue 567003002: Revert of Convert device::UsbConfigDescriptor and friends to structs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 | « device/usb/usb_device_handle.h ('k') | device/usb/usb_device_handle_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/usb/usb_device_handle_impl.h
diff --git a/device/usb/usb_device_handle_impl.h b/device/usb/usb_device_handle_impl.h
index 0498f263cf1f739edbbe13a79657b4b606128bdd..e4e5163dcb93eb4ce260bd9dfa8be15558370e9e 100644
--- a/device/usb/usb_device_handle_impl.h
+++ b/device/usb/usb_device_handle_impl.h
@@ -13,6 +13,7 @@
#include "base/strings/string16.h"
#include "base/threading/thread_checker.h"
#include "device/usb/usb_device_handle.h"
+#include "device/usb/usb_interface.h"
#include "net/base/io_buffer.h"
#include "third_party/libusb/src/libusb/libusb.h"
@@ -23,7 +24,7 @@
namespace device {
class UsbContext;
-struct UsbConfigDescriptor;
+class UsbConfigDescriptor;
class UsbDeviceImpl;
typedef libusb_device_handle* PlatformUsbDeviceHandle;
@@ -88,7 +89,7 @@
UsbDeviceHandleImpl(scoped_refptr<UsbContext> context,
UsbDeviceImpl* device,
PlatformUsbDeviceHandle handle,
- const UsbConfigDescriptor& config);
+ scoped_refptr<UsbConfigDescriptor> interfaces);
virtual ~UsbDeviceHandleImpl();
@@ -142,7 +143,7 @@
PlatformUsbDeviceHandle handle_;
- const UsbConfigDescriptor& config_;
+ scoped_refptr<UsbConfigDescriptor> interfaces_;
std::vector<uint16> languages_;
std::map<uint8, base::string16> strings_;
« no previous file with comments | « device/usb/usb_device_handle.h ('k') | device/usb/usb_device_handle_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698