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

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

Issue 1841763002: Add a kill switch for all of Web Bluetooth. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkcr
Patch Set: Avoid exposing the "kill switch" concept to content/ 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
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..7ca24b6c4a41a9681f0c2b91a3c88c9844cb68b8 100644
--- a/third_party/WebKit/Source/modules/bluetooth/BluetoothError.cpp
+++ b/third_party/WebKit/Source/modules/bluetooth/BluetoothError.cpp
@@ -48,8 +48,9 @@ DOMException* BluetoothError::take(ScriptPromiseResolver*, const WebBluetoothErr
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(ChooserNotShown_APIGloballyDisabled, NotFoundError, "Web Bluetooth API globally disabled.");
+ MAP_ERROR(ChooserNotShown_APILocallyDisabled, NotFoundError, "User or their enterprise policy has disabled Web Bluetooth.");
+ MAP_ERROR(ChooserNotShown_BrowserDeniedPermissionToScan, NotFoundError, "User denied the browser permission to scan for Bluetooth devices.");
ortuno 2016/03/30 19:19:46 We have errors where we don't show the chooser i.e
Jeffrey Yasskin 2016/03/30 19:31:24 Yeah, there's a chance this one did show the choos
ortuno 2016/03/30 19:41:51 "UserDeniedPermissionToScan"?
Jeffrey Yasskin 2016/03/30 23:11:40 Sure, done.
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.");

Powered by Google App Engine
This is Rietveld 408576698