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

Unified Diff: device/usb/usb_device_impl.h

Issue 1514603006: Implement basic USB device enumeration on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address qinmin's comments. Created 4 years, 12 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_android.cc ('k') | device/usb/usb_device_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/usb/usb_device_impl.h
diff --git a/device/usb/usb_device_impl.h b/device/usb/usb_device_impl.h
index 337c0e8642b6e4c3edadbf382e38e5b98d6b5473..a64e3d1b08d34223af19342f3725bcac8e446fbb 100644
--- a/device/usb/usb_device_impl.h
+++ b/device/usb/usb_device_impl.h
@@ -6,6 +6,8 @@
#define DEVICE_USB_USB_DEVICE_IMPL_H_
#include <stdint.h>
+
+#include <string>
#include <utility>
#include <vector>
@@ -45,7 +47,6 @@ class UsbDeviceImpl : public UsbDevice {
void CheckUsbAccess(const ResultCallback& callback) override;
#endif // OS_CHROMEOS
void Open(const OpenCallback& callback) override;
- bool Close(scoped_refptr<UsbDeviceHandle> handle) override;
const UsbConfigDescriptor* GetActiveConfiguration() override;
// These functions are used during enumeration only. The values must not
@@ -87,6 +88,7 @@ class UsbDeviceImpl : public UsbDevice {
void ReadAllConfigurations();
// Called by UsbDeviceHandleImpl.
+ void Close(scoped_refptr<UsbDeviceHandle> handle);
void RefreshActiveConfiguration();
private:
« no previous file with comments | « device/usb/usb_device_android.cc ('k') | device/usb/usb_device_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698