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

Unified Diff: device/usb/usb_device_impl.h

Issue 1877503003: Replace libusb in the Linux/Chrome OS USB I/O path. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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: device/usb/usb_device_impl.h
diff --git a/device/usb/usb_device_impl.h b/device/usb/usb_device_impl.h
index 4c94485a283676dbc281d00a14123c1f749c8fe8..13e2cf9d51f61577ca451846c6cf1f2cebeb4156 100644
--- a/device/usb/usb_device_impl.h
+++ b/device/usb/usb_device_impl.h
@@ -12,6 +12,7 @@
#include <utility>
#include "base/callback.h"
+#include "base/files/scoped_file.h"
#include "base/macros.h"
#include "base/threading/thread_checker.h"
#include "build/build_config.h"
@@ -73,6 +74,7 @@ class UsbDeviceImpl : public UsbDevice {
protected:
friend class UsbServiceImpl;
friend class UsbDeviceHandleImpl;
+ friend class UsbDeviceHandleUsbfs;
// Called by UsbServiceImpl only;
UsbDeviceImpl(scoped_refptr<UsbContext> context,
@@ -89,7 +91,8 @@ class UsbDeviceImpl : public UsbDevice {
void ReadAllConfigurations();
// Called by UsbDeviceHandleImpl.
- void HandleClosed(scoped_refptr<UsbDeviceHandle> handle);
+ void HandleClosed(UsbDeviceHandle* handle);
+ void ActiveConfigurationChanged(int configuration_value);
void RefreshActiveConfiguration();
private:
@@ -102,10 +105,15 @@ class UsbDeviceImpl : public UsbDevice {
const std::string& error_message);
void OpenOnBlockingThreadWithFd(dbus::FileDescriptor fd,
const OpenCallback& callback);
-#endif
+#else
void OpenOnBlockingThread(const OpenCallback& callback);
+#endif // defined(OS_CHROMEOS)
+#if defined(OS_LINUX)
+ void Opened(base::ScopedFD fd, const OpenCallback& callback);
+#else
void Opened(PlatformUsbDeviceHandle platform_handle,
const OpenCallback& callback);
+#endif // defined(OS_LINUX)
base::ThreadChecker thread_checker_;
PlatformUsbDevice platform_device_;

Powered by Google App Engine
This is Rietveld 408576698