diff options
| author | Ben Murdoch <benm@google.com> | 2014-12-11 12:27:44 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2014-12-11 12:27:44 +0000 |
| commit | 499b68b2a50f97e14f9b5a94ba3a91dafb161934 (patch) | |
| tree | 8ce8b0e38abc5d4c581b1ba9c5ad0c36796d7d4d /device | |
| parent | 9ee52bce72cd41a1b4dc6465e17465c50ca50210 (diff) | |
| download | chromium_org-499b68b2a50f97e14f9b5a94ba3a91dafb161934.tar.gz | |
Merge from Chromium at DEPS revision 40.0.2214.38
This commit was generated by merge_to_master.py.
Change-Id: I5e881388509cd5fb3882f4ba2ef6663965219173
Diffstat (limited to 'device')
| -rw-r--r-- | device/usb/usb_device_impl.cc | 11 | ||||
| -rw-r--r-- | device/usb/usb_device_impl.h | 5 |
2 files changed, 13 insertions, 3 deletions
diff --git a/device/usb/usb_device_impl.cc b/device/usb/usb_device_impl.cc index 57f3d6391b..6fa3d5053d 100644 --- a/device/usb/usb_device_impl.cc +++ b/device/usb/usb_device_impl.cc @@ -157,6 +157,12 @@ UsbDeviceImpl::UsbDeviceImpl( continue; } +#if defined(OS_CHROMEOS) + value = udev_device_get_devnode(device.get()); + if (value) { + devnode_ = value; + } +#endif value = udev_device_get_sysattr_value(device.get(), "manufacturer"); if (value) { manufacturer_ = base::UTF8ToUTF16(value); @@ -207,10 +213,9 @@ void UsbDeviceImpl::RequestUsbAccess( ui_task_runner_->PostTask( FROM_HERE, - base::Bind(&chromeos::PermissionBrokerClient::RequestUsbAccess, + base::Bind(&chromeos::PermissionBrokerClient::RequestPathAccess, base::Unretained(client), - vendor_id(), - product_id(), + devnode_, interface_id, base::Bind(&OnRequestUsbAccessReplied, base::ThreadTaskRunnerHandle::Get(), diff --git a/device/usb/usb_device_impl.h b/device/usb/usb_device_impl.h index e962c6da2a..379d401985 100644 --- a/device/usb/usb_device_impl.h +++ b/device/usb/usb_device_impl.h @@ -76,6 +76,11 @@ class UsbDeviceImpl : public UsbDevice { void CacheStrings(); bool strings_cached_; #endif +#if defined(OS_CHROMEOS) + // On Chrome OS save the devnode string for requesting path access from + // permission broker. + std::string devnode_; +#endif // The active configuration descriptor is not read immediately but cached for // later use. |