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

Unified Diff: content/renderer/usb/web_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: Created 4 years, 12 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: content/renderer/usb/web_usb_device_impl.cc
diff --git a/content/renderer/usb/web_usb_device_impl.cc b/content/renderer/usb/web_usb_device_impl.cc
index ab812fd174a345b0f5847b91edeff1f99b7afdc2..d2ffe8b104b6df38040bff7b71d3712fe9cdafb3 100644
--- a/content/renderer/usb/web_usb_device_impl.cc
+++ b/content/renderer/usb/web_usb_device_impl.cc
@@ -66,10 +66,10 @@ void OnOpenDevice(
device::usb::OpenDeviceError error) {
auto scoped_callbacks = callbacks.PassCallbacks();
switch(error) {
- case device::usb::OPEN_DEVICE_ERROR_OK:
+ case device::usb::OpenDeviceError::OK:
scoped_callbacks->onSuccess();
break;
- case device::usb::OPEN_DEVICE_ERROR_ACCESS_DENIED:
+ case device::usb::OpenDeviceError::ACCESS_DENIED:
scoped_callbacks->onError(blink::WebUSBError(
blink::WebUSBError::Error::Security,
base::ASCIIToUTF16(kDeviceNoAccess)));
@@ -117,7 +117,7 @@ void OnTransferIn(
device::usb::TransferStatus status,
mojo::Array<uint8_t> data) {
auto scoped_callbacks = callbacks.PassCallbacks();
- if (status != device::usb::TRANSFER_STATUS_COMPLETED) {
+ if (status != device::usb::TransferStatus::COMPLETED) {
RejectWithTransferError(std::move(scoped_callbacks));
return;
}
@@ -134,13 +134,13 @@ void OnTransferOut(
auto scoped_callbacks = callbacks.PassCallbacks();
scoped_ptr<blink::WebUSBTransferInfo> info(new blink::WebUSBTransferInfo());
switch (status) {
- case device::usb::TRANSFER_STATUS_COMPLETED:
+ case device::usb::TransferStatus::COMPLETED:
info->status = blink::WebUSBTransferInfo::Status::Ok;
break;
- case device::usb::TRANSFER_STATUS_STALLED:
+ case device::usb::TransferStatus::STALLED:
info->status = blink::WebUSBTransferInfo::Status::Stall;
break;
- case device::usb::TRANSFER_STATUS_BABBLE:
+ case device::usb::TransferStatus::BABBLE:
info->status = blink::WebUSBTransferInfo::Status::Babble;
break;
default:

Powered by Google App Engine
This is Rietveld 408576698