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

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

Issue 1527183003: Change mojo enums to be scoped enums in the generated C++ bindings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mojo-binding-equals
Patch Set: rebase Created 4 years, 11 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
Index: device/devices_app/usb/device_impl.cc
diff --git a/device/devices_app/usb/device_impl.cc b/device/devices_app/usb/device_impl.cc
index bc1cf1765540aad86c9962734aca1b1c40e7bba1..fd2f0ff6bc5c1abf7adf3a9f9887a313ad9863e9 100644
--- a/device/devices_app/usb/device_impl.cc
+++ b/device/devices_app/usb/device_impl.cc
@@ -95,7 +95,7 @@ void OnControlTransferInPermissionCheckComplete(
base::Bind(&OnTransferIn, base::Passed(&callback)));
} else {
mojo::Array<uint8_t> data;
- callback->Run(TRANSFER_STATUS_PERMISSION_DENIED, std::move(data));
+ callback->Run(TransferStatus::PERMISSION_DENIED, std::move(data));
}
}
@@ -124,7 +124,7 @@ void OnControlTransferOutPermissionCheckComplete(
params->request, params->value, params->index, buffer, data.size(),
timeout, base::Bind(&OnTransferOut, base::Passed(&callback)));
} else {
- callback->Run(TRANSFER_STATUS_PERMISSION_DENIED);
+ callback->Run(TransferStatus::PERMISSION_DENIED);
}
}
@@ -189,15 +189,15 @@ void DeviceImpl::HasControlTransferPermission(
DCHECK(device_handle_);
const UsbConfigDescriptor* config = device_->GetActiveConfiguration();
- if (recipient == CONTROL_TRANSFER_RECIPIENT_INTERFACE ||
- recipient == CONTROL_TRANSFER_RECIPIENT_ENDPOINT) {
+ if (recipient == ControlTransferRecipient::INTERFACE ||
+ recipient == ControlTransferRecipient::ENDPOINT) {
if (!config) {
callback.Run(false);
return;
}
uint8_t interface_number = index & 0xff;
- if (recipient == CONTROL_TRANSFER_RECIPIENT_ENDPOINT) {
+ if (recipient == ControlTransferRecipient::ENDPOINT) {
if (!device_handle_->FindInterfaceByEndpoint(index & 0xff,
&interface_number)) {
callback.Run(false);
@@ -220,7 +220,7 @@ void DeviceImpl::HasControlTransferPermission(
void DeviceImpl::OnOpen(const OpenCallback& callback,
scoped_refptr<UsbDeviceHandle> handle) {
device_handle_ = handle;
- callback.Run(handle ? OPEN_DEVICE_ERROR_OK : OPEN_DEVICE_ERROR_ACCESS_DENIED);
+ callback.Run(handle ? OpenDeviceError::OK : OpenDeviceError::ACCESS_DENIED);
}
void DeviceImpl::GetDeviceInfo(const GetDeviceInfoCallback& callback) {
@@ -325,7 +325,7 @@ void DeviceImpl::ControlTransferIn(ControlTransferParamsPtr params,
uint32_t timeout,
const ControlTransferInCallback& callback) {
if (!device_handle_) {
- callback.Run(TRANSFER_STATUS_ERROR, mojo::Array<uint8_t>());
+ callback.Run(TransferStatus::TRANSFER_ERROR, mojo::Array<uint8_t>());
return;
}
@@ -345,7 +345,7 @@ void DeviceImpl::ControlTransferOut(
uint32_t timeout,
const ControlTransferOutCallback& callback) {
if (!device_handle_) {
- callback.Run(TRANSFER_STATUS_ERROR);
+ callback.Run(TransferStatus::TRANSFER_ERROR);
return;
}
@@ -364,7 +364,7 @@ void DeviceImpl::GenericTransferIn(uint8_t endpoint_number,
uint32_t timeout,
const GenericTransferInCallback& callback) {
if (!device_handle_) {
- callback.Run(TRANSFER_STATUS_ERROR, mojo::Array<uint8_t>());
+ callback.Run(TransferStatus::TRANSFER_ERROR, mojo::Array<uint8_t>());
return;
}
@@ -382,7 +382,7 @@ void DeviceImpl::GenericTransferOut(
uint32_t timeout,
const GenericTransferOutCallback& callback) {
if (!device_handle_) {
- callback.Run(TRANSFER_STATUS_ERROR);
+ callback.Run(TransferStatus::TRANSFER_ERROR);
return;
}
@@ -403,7 +403,8 @@ void DeviceImpl::IsochronousTransferIn(
uint32_t timeout,
const IsochronousTransferInCallback& callback) {
if (!device_handle_) {
- callback.Run(TRANSFER_STATUS_ERROR, mojo::Array<mojo::Array<uint8_t>>());
+ callback.Run(TransferStatus::TRANSFER_ERROR,
+ mojo::Array<mojo::Array<uint8_t>>());
return;
}
@@ -425,7 +426,7 @@ void DeviceImpl::IsochronousTransferOut(
uint32_t timeout,
const IsochronousTransferOutCallback& callback) {
if (!device_handle_) {
- callback.Run(TRANSFER_STATUS_ERROR);
+ callback.Run(TransferStatus::TRANSFER_ERROR);
return;
}
« no previous file with comments | « content/shell/renderer/layout_test/blink_test_runner.cc ('k') | device/devices_app/usb/device_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698