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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/Source/modules/bluetooth/BluetoothError.cpp

Issue 1837253002: bluetooth: Change definition of WebBluetoothError to mojo enum (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@my-origin
Patch Set: Created 4 years, 9 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 | « content/browser/bluetooth/bluetooth_dispatcher_host.cc ('k') | third_party/WebKit/public/platform/modules/bluetooth/WebBluetoothError.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/modules/bluetooth/BluetoothError.cpp
diff --git a/third_party/WebKit/Source/modules/bluetooth/BluetoothError.cpp b/third_party/WebKit/Source/modules/bluetooth/BluetoothError.cpp
index ff601f927851040566861b866ac35d00f4de67ae..0c4e17bbe4ee26ce505651bd5ec911fbd1212c41 100644
--- a/third_party/WebKit/Source/modules/bluetooth/BluetoothError.cpp
+++ b/third_party/WebKit/Source/modules/bluetooth/BluetoothError.cpp
@@ -12,64 +12,67 @@ namespace blink {
DOMException* BluetoothError::take(ScriptPromiseResolver*, const WebBluetoothError& webError)
{
switch (webError) {
+ case WebBluetoothError::SUCCESS:
+ ASSERT_NOT_REACHED();
+ return DOMException::create(UnknownError);
#define MAP_ERROR(enumeration, name, message) \
case WebBluetoothError::enumeration: \
return DOMException::create(name, message)
// InvalidModificationErrors:
- MAP_ERROR(GATTInvalidAttributeLength, InvalidModificationError, "GATT Error: invalid attribute length.");
+ MAP_ERROR(GATT_INVALID_ATTRIBUTE_LENGTH, InvalidModificationError, "GATT Error: invalid attribute length.");
// InvalidStateErrors:
- MAP_ERROR(ServiceNoLongerExists, InvalidStateError, "GATT Service no longer exists.");
- MAP_ERROR(CharacteristicNoLongerExists, InvalidStateError, "GATT Characteristic no longer exists.");
+ MAP_ERROR(SERVICE_NO_LONGER_EXISTS, InvalidStateError, "GATT Service no longer exists.");
+ MAP_ERROR(CHARACTERISTIC_NO_LONGER_EXISTS, InvalidStateError, "GATT Characteristic no longer exists.");
// NetworkErrors:
- MAP_ERROR(ConnectAlreadyInProgress, NetworkError, "Connection already in progress.");
- MAP_ERROR(ConnectAttributeLengthInvalid, NetworkError, "Write operation exceeds the maximum length of the attribute.");
- MAP_ERROR(ConnectAuthCanceled, NetworkError, "Authentication canceled.");
- MAP_ERROR(ConnectAuthFailed, NetworkError, "Authentication failed.");
- MAP_ERROR(ConnectAuthRejected, NetworkError, "Authentication rejected.");
- MAP_ERROR(ConnectAuthTimeout, NetworkError, "Authentication timeout.");
- MAP_ERROR(ConnectConnectionCongested, NetworkError, "Remote device connection is congested.");
- MAP_ERROR(ConnectInsufficientEncryption, NetworkError, "Insufficient encryption for a given operation");
- MAP_ERROR(ConnectOffsetInvalid, NetworkError, "Read or write operation was requested with an invalid offset.");
- MAP_ERROR(ConnectReadNotPermitted, NetworkError, "GATT read operation is not permitted.");
- MAP_ERROR(ConnectRequestNotSupported, NetworkError, "The given request is not supported.");
- MAP_ERROR(ConnectUnknownError, NetworkError, "Unknown error when connecting to the device.");
- MAP_ERROR(ConnectUnknownFailure, NetworkError, "Connection failed for unknown reason.");
- MAP_ERROR(ConnectUnsupportedDevice, NetworkError, "Unsupported device.");
- MAP_ERROR(ConnectWriteNotPermitted, NetworkError, "GATT write operation is not permitted.");
- MAP_ERROR(DeviceNoLongerInRange, NetworkError, "Bluetooth Device is no longer in range.");
- MAP_ERROR(GATTNotPaired, NetworkError, "GATT Error: Not paired.");
- MAP_ERROR(GATTOperationInProgress, NetworkError, "GATT operation already in progress.");
- MAP_ERROR(UntranslatedConnectErrorCode, NetworkError, "Unknown ConnectErrorCode.");
+ MAP_ERROR(CONNECT_ALREADY_IN_PROGRESS, NetworkError, "Connection already in progress.");
+ MAP_ERROR(CONNECT_ATTRIBUTE_LENGTH_INVALID, NetworkError, "Write operation exceeds the maximum length of the attribute.");
+ MAP_ERROR(CONNECT_AUTH_CANCELED, NetworkError, "Authentication canceled.");
+ MAP_ERROR(CONNECT_AUTH_FAILED, NetworkError, "Authentication failed.");
+ MAP_ERROR(CONNECT_AUTH_REJECTED, NetworkError, "Authentication rejected.");
+ MAP_ERROR(CONNECT_AUTH_TIMEOUT, NetworkError, "Authentication timeout.");
+ MAP_ERROR(CONNECT_CONNECTION_CONGESTED, NetworkError, "Remote device connection is congested.");
+ MAP_ERROR(CONNECT_INSUFFICIENT_ENCRYPTION, NetworkError, "Insufficient encryption for a given operation");
+ MAP_ERROR(CONNECT_OFFSET_INVALID, NetworkError, "Read or write operation was requested with an invalid offset.");
+ MAP_ERROR(CONNECT_READ_NOT_PERMITTED, NetworkError, "GATT read operation is not permitted.");
+ MAP_ERROR(CONNECT_REQUEST_NOT_SUPPORTED, NetworkError, "The given request is not supported.");
+ MAP_ERROR(CONNECT_UNKNOWN_ERROR, NetworkError, "Unknown error when connecting to the device.");
+ MAP_ERROR(CONNECT_UNKNOWN_FAILURE, NetworkError, "Connection failed for unknown reason.");
+ MAP_ERROR(CONNECT_UNSUPPORTED_DEVICE, NetworkError, "Unsupported device.");
+ MAP_ERROR(CONNECT_WRITE_NOT_PERMITTED, NetworkError, "GATT write operation is not permitted.");
+ MAP_ERROR(DEVICE_NO_LONGER_IN_RANGE, NetworkError, "Bluetooth Device is no longer in range.");
+ MAP_ERROR(GATT_NOT_PAIRED, NetworkError, "GATT Error: Not paired.");
+ MAP_ERROR(GATT_OPERATION_IN_PROGRESS, NetworkError, "GATT operation already in progress.");
+ MAP_ERROR(UNTRANSLATED_CONNECT_ERROR_CODE, NetworkError, "Unknown ConnectErrorCode.");
// NotFoundErrors:
- MAP_ERROR(NoBluetoothAdapter, NotFoundError, "Bluetooth adapter not available.");
- MAP_ERROR(ChosenDeviceVanished, NotFoundError, "User selected a device that doesn't exist anymore.");
- MAP_ERROR(ChooserCancelled, NotFoundError, "User cancelled the requestDevice() chooser.");
- MAP_ERROR(ChooserDisabled, NotFoundError, "User or their enterprise policy has disabled Web Bluetooth globally.");
- MAP_ERROR(ChooserDeniedPermission, NotFoundError, "User denied the browser permission to scan for Bluetooth devices.");
- MAP_ERROR(ServiceNotFound, NotFoundError, "Service not found in device.");
- MAP_ERROR(CharacteristicNotFound, NotFoundError, "No Characteristics with specified UUID found in Service.");
- MAP_ERROR(NoCharacteristicsFound, NotFoundError, "No Characteristics found in service.");
+ MAP_ERROR(NO_BLUETOOTH_ADAPTER, NotFoundError, "Bluetooth adapter not available.");
+ MAP_ERROR(CHOSEN_DEVICE_VANISHED, NotFoundError, "User selected a device that doesn't exist anymore.");
+ MAP_ERROR(CHOOSER_CANCELLED, NotFoundError, "User cancelled the requestDevice() chooser.");
+ MAP_ERROR(CHOOSER_DISABLED, NotFoundError, "User or their enterprise policy has disabled Web Bluetooth globally.");
+ MAP_ERROR(CHOOSER_DENIED_PERMISSION, NotFoundError, "User denied the browser permission to scan for Bluetooth devices.");
+ MAP_ERROR(SERVICE_NOT_FOUND, NotFoundError, "Service not found in device.");
+ MAP_ERROR(CHARACTERISTIC_NOT_FOUND, NotFoundError, "No Characteristics with specified UUID found in Service.");
+ MAP_ERROR(NO_CHARACTERISTICS_FOUND, NotFoundError, "No Characteristics found in service.");
// NotSupportedErrors:
- MAP_ERROR(GATTUnknownError, NotSupportedError, "GATT Error Unknown.");
- MAP_ERROR(GATTUnknownFailure, NotSupportedError, "GATT operation failed for unknown reason.");
- MAP_ERROR(GATTNotPermitted, NotSupportedError, "GATT operation not permitted.");
- MAP_ERROR(GATTNotSupported, NotSupportedError, "GATT Error: Not supported.");
- MAP_ERROR(GATTUntranslatedErrorCode, NotSupportedError, "GATT Error: Unknown GattErrorCode.");
+ MAP_ERROR(GATT_UNKNOWN_ERROR, NotSupportedError, "GATT Error Unknown.");
+ MAP_ERROR(GATT_UNKNOWN_FAILURE, NotSupportedError, "GATT operation failed for unknown reason.");
+ MAP_ERROR(GATT_NOT_PERMITTED, NotSupportedError, "GATT operation not permitted.");
+ MAP_ERROR(GATT_NOT_SUPPORTED, NotSupportedError, "GATT Error: Not supported.");
+ MAP_ERROR(GATT_UNTRANSLATED_ERROR_CODE, NotSupportedError, "GATT Error: Unknown GattErrorCode.");
// SecurityErrors:
- MAP_ERROR(GATTNotAuthorized, SecurityError, "GATT operation not authorized.");
- MAP_ERROR(BlacklistedCharacteristicUUID, SecurityError, "getCharacteristic(s) called with blacklisted UUID. https://goo.gl/4NeimX");
- MAP_ERROR(BlacklistedRead, SecurityError, "readValue() called on blacklisted object marked exclude-reads. https://goo.gl/4NeimX");
- MAP_ERROR(BlacklistedWrite, SecurityError, "writeValue() called on blacklisted object marked exclude-writes. https://goo.gl/4NeimX");
- MAP_ERROR(NotAllowedToAccessService, SecurityError, "Origin is not allowed to access the service. Remember to add the service to a filter or to optionalServices in requestDevice().");
- MAP_ERROR(RequestDeviceWithBlacklistedUUID, SecurityError, "requestDevice() called with a filter containing a blacklisted UUID. https://goo.gl/4NeimX");
- MAP_ERROR(RequestDeviceWithUniqueOrigin, SecurityError, "requestDevice() called from sandboxed or otherwise unique origin.");
- MAP_ERROR(RequestDeviceWithoutFrame, SecurityError, "No window to show the requestDevice() dialog.");
+ MAP_ERROR(GATT_NOT_AUTHORIZED, SecurityError, "GATT operation not authorized.");
+ MAP_ERROR(BLACKLISTED_CHARACTERISTIC_UUID, SecurityError, "getCharacteristic(s) called with blacklisted UUID. https://goo.gl/4NeimX");
+ MAP_ERROR(BLACKLISTED_READ, SecurityError, "readValue() called on blacklisted object marked exclude-reads. https://goo.gl/4NeimX");
+ MAP_ERROR(BLACKLISTED_WRITE, SecurityError, "writeValue() called on blacklisted object marked exclude-writes. https://goo.gl/4NeimX");
+ MAP_ERROR(NOT_ALLOWED_TO_ACCESS_SERVICE, SecurityError, "Origin is not allowed to access the service. Remember to add the service to a filter or to optionalServices in requestDevice().");
+ MAP_ERROR(REQUEST_DEVICE_WITH_BLACKLISTED_UUID, SecurityError, "requestDevice() called with a filter containing a blacklisted UUID. https://goo.gl/4NeimX");
+ MAP_ERROR(REQUEST_DEVICE_WITH_UNIQUE_ORIGIN, SecurityError, "requestDevice() called from sandboxed or otherwise unique origin.");
+ MAP_ERROR(REQUEST_DEVICE_WITHOUT_FRAME, SecurityError, "No window to show the requestDevice() dialog.");
#undef MAP_ERROR
}
« no previous file with comments | « content/browser/bluetooth/bluetooth_dispatcher_host.cc ('k') | third_party/WebKit/public/platform/modules/bluetooth/WebBluetoothError.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698