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

Unified Diff: device/devices_app/usb/device_manager_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 | « device/devices_app/usb/device_impl_unittest.cc ('k') | device/devices_app/usb/device_manager_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/devices_app/usb/device_manager_impl.h
diff --git a/device/devices_app/usb/device_manager_impl.h b/device/devices_app/usb/device_manager_impl.h
index 86554fda68fb6058a7188452336e4e58bdb4bcc0..31e8173d1eaa6cd9c132bbbd135b524fdba77875 100644
--- a/device/devices_app/usb/device_manager_impl.h
+++ b/device/devices_app/usb/device_manager_impl.h
@@ -57,19 +57,16 @@ class DeviceManagerImpl : public DeviceManager {
void GetDevices(EnumerationOptionsPtr options,
const GetDevicesCallback& callback) override;
void GetDeviceChanges(const GetDeviceChangesCallback& callback) override;
- void OpenDevice(const mojo::String& guid,
- mojo::InterfaceRequest<Device> device_request,
- const OpenDeviceCallback& callback) override;
-
- void OnGotDeviceInfoForOpen(mojo::InterfaceRequest<Device> device_request,
- const OpenDeviceCallback& callback,
- DeviceInfoPtr device_info);
- void OnOpenDevicePermissionCheckComplete(
- mojo::InterfaceRequest<Device> device_request,
- const OpenDeviceCallback& callback,
- mojo::Array<mojo::String> allowed_guids);
+ void GetDevice(const mojo::String& guid,
+ mojo::InterfaceRequest<Device> device_request) override;
// Callbacks to handle the async responses from the underlying UsbService.
+ void OnGetDevice(mojo::InterfaceRequest<Device> device_request,
+ scoped_refptr<UsbDevice> device);
+ void OnGetDevicePermissionCheckComplete(
+ scoped_refptr<device::UsbDevice> device,
+ mojo::InterfaceRequest<Device> device_request,
+ mojo::Array<mojo::String> allowed_guids);
void OnGetDevices(EnumerationOptionsPtr options,
const GetDevicesCallback& callback,
const DeviceList& devices);
« no previous file with comments | « device/devices_app/usb/device_impl_unittest.cc ('k') | device/devices_app/usb/device_manager_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698