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

Unified Diff: content/renderer/usb/web_usb_device_impl.h

Issue 1352683006: Move device opening from DeviceManager to Device. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 | « content/renderer/usb/web_usb_client_impl.cc ('k') | content/renderer/usb/web_usb_device_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/usb/web_usb_device_impl.h
diff --git a/content/renderer/usb/web_usb_device_impl.h b/content/renderer/usb/web_usb_device_impl.h
index 3f6eab52b1ef55a603a2abc0a82bf71c357b45fc..172817a3479cd1b90682871ec1f16f88632a61ce 100644
--- a/content/renderer/usb/web_usb_device_impl.h
+++ b/content/renderer/usb/web_usb_device_impl.h
@@ -23,7 +23,7 @@ namespace content {
class WebUSBDeviceImpl : public blink::WebUSBDevice {
public:
- WebUSBDeviceImpl(device::usb::DeviceManagerPtr device_manager,
+ WebUSBDeviceImpl(device::usb::DevicePtr device,
const blink::WebUSBDeviceInfo& device_info);
~WebUSBDeviceImpl() override;
@@ -61,10 +61,8 @@ class WebUSBDeviceImpl : public blink::WebUSBDevice {
blink::WebUSBDeviceBulkTransferCallbacks* callbacks) override;
void reset(blink::WebUSBDeviceResetCallbacks* callbacks) override;
- device::usb::DeviceManagerPtr device_manager_;
-
- blink::WebUSBDeviceInfo device_info_;
device::usb::DevicePtr device_;
+ blink::WebUSBDeviceInfo device_info_;
base::WeakPtrFactory<WebUSBDeviceImpl> weak_factory_;
« no previous file with comments | « content/renderer/usb/web_usb_client_impl.cc ('k') | content/renderer/usb/web_usb_device_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698