Index: device/usb/mojo/device_impl.cc |
diff --git a/device/usb/mojo/device_impl.cc b/device/usb/mojo/device_impl.cc |
index 2d8f7c44fdbdcc5dbfec3bbb7f652cd56f14623c..b6e696632b589ad48d7a8c6e023f329b804fc8d6 100644 |
--- a/device/usb/mojo/device_impl.cc |
+++ b/device/usb/mojo/device_impl.cc |
@@ -144,9 +144,6 @@ bool DeviceImpl::HasControlTransferPermission( |
DCHECK(device_handle_); |
const UsbConfigDescriptor* config = device_->active_configuration(); |
- if (!permission_provider_) |
- return false; |
- |
if (recipient == UsbControlTransferRecipient::INTERFACE || |
recipient == UsbControlTransferRecipient::ENDPOINT) { |
if (!config) |
@@ -167,11 +164,9 @@ bool DeviceImpl::HasControlTransferPermission( |
if (interface == nullptr) |
return false; |
- return permission_provider_->HasFunctionPermission( |
- interface->first_interface, config->configuration_value, device_); |
+ return true; |
iclelland.google
2017/05/02 14:42:52
Drive-by: I'm not really looking at this part of t
Reilly Grant (use Gerrit)
2017/05/02 19:29:05
Done.
|
} else if (config) { |
- return permission_provider_->HasConfigurationPermission( |
- config->configuration_value, device_); |
+ return true; |
} else { |
// Client must already have device permission to have gotten this far. |
return true; |
@@ -196,8 +191,7 @@ void DeviceImpl::OnOpen(base::WeakPtr<DeviceImpl> self, |
void DeviceImpl::OnPermissionGrantedForOpen(const OpenCallback& callback, |
bool granted) { |
- if (granted && permission_provider_ && |
- permission_provider_->HasDevicePermission(device_)) { |
+ if (granted) { |
lunalu1
2017/05/03 15:01:21
If I recall correctly, you don't need bracket here
Reilly Grant (use Gerrit)
2017/05/04 01:16:50
Done, though I put the error case first which is m
|
device_->Open( |
base::Bind(&DeviceImpl::OnOpen, weak_factory_.GetWeakPtr(), callback)); |
} else { |
@@ -218,13 +212,8 @@ void DeviceImpl::Open(const OpenCallback& callback) { |
return; |
} |
- if (permission_provider_ && |
- permission_provider_->HasDevicePermission(device_)) { |
- device_->Open( |
- base::Bind(&DeviceImpl::OnOpen, weak_factory_.GetWeakPtr(), callback)); |
- } else { |
- callback.Run(mojom::UsbOpenDeviceError::ACCESS_DENIED); |
- } |
+ device_->Open( |
+ base::Bind(&DeviceImpl::OnOpen, weak_factory_.GetWeakPtr(), callback)); |
} |
void DeviceImpl::Close(const CloseCallback& callback) { |
@@ -239,12 +228,7 @@ void DeviceImpl::SetConfiguration(uint8_t value, |
return; |
} |
- if (permission_provider_ && |
- permission_provider_->HasConfigurationPermission(value, device_)) { |
- device_handle_->SetConfiguration(value, callback); |
- } else { |
- callback.Run(false); |
- } |
+ device_handle_->SetConfiguration(value, callback); |
} |
void DeviceImpl::ClaimInterface(uint8_t interface_number, |
@@ -270,14 +254,7 @@ void DeviceImpl::ClaimInterface(uint8_t interface_number, |
return; |
} |
- if (permission_provider_ && |
- permission_provider_->HasFunctionPermission(interface_it->first_interface, |
- config->configuration_value, |
- device_)) { |
- device_handle_->ClaimInterface(interface_number, callback); |
- } else { |
- callback.Run(false); |
- } |
+ device_handle_->ClaimInterface(interface_number, callback); |
} |
void DeviceImpl::ReleaseInterface(uint8_t interface_number, |