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

Unified Diff: device/usb/mojo/device_impl.cc

Issue 1854483002: Remove WebUSB descriptor data from device.mojom. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@use_interface_associations
Patch Set: Rebased. 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
« no previous file with comments | « chrome/browser/usb/web_usb_permission_provider.cc ('k') | device/usb/mojo/device_manager_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/usb/mojo/device_impl.cc
diff --git a/device/usb/mojo/device_impl.cc b/device/usb/mojo/device_impl.cc
index 9ac05bcd3e76374887ce343882b475d607f23aea..dddf6815230d36c53aa83eff063d45a773f76c15 100644
--- a/device/usb/mojo/device_impl.cc
+++ b/device/usb/mojo/device_impl.cc
@@ -186,10 +186,10 @@ bool DeviceImpl::HasControlTransferPermission(
return false;
return permission_provider_->HasFunctionPermission(
- interface->first_interface, config->configuration_value, *device_info_);
+ interface->first_interface, config->configuration_value, device_);
} else if (config) {
return permission_provider_->HasConfigurationPermission(
- config->configuration_value, *device_info_);
+ config->configuration_value, device_);
} else {
// Client must already have device permission to have gotten this far.
return true;
@@ -231,7 +231,7 @@ void DeviceImpl::SetConfiguration(uint8_t value,
}
if (permission_provider_ &&
- permission_provider_->HasConfigurationPermission(value, *device_info_)) {
+ permission_provider_->HasConfigurationPermission(value, device_)) {
device_handle_->SetConfiguration(value, WrapMojoCallback(callback));
} else {
callback.Run(false);
@@ -264,7 +264,7 @@ void DeviceImpl::ClaimInterface(uint8_t interface_number,
if (permission_provider_ &&
permission_provider_->HasFunctionPermission(interface_it->first_interface,
config->configuration_value,
- *device_info_)) {
+ device_)) {
device_handle_->ClaimInterface(interface_number,
WrapMojoCallback(callback));
} else {
« no previous file with comments | « chrome/browser/usb/web_usb_permission_provider.cc ('k') | device/usb/mojo/device_manager_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698