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

Unified Diff: content/browser/bluetooth/bluetooth_device_chooser_controller.cc

Issue 2488283003: bluetooth: web: Rename Blacklist to Blocklist (Closed)
Patch Set: bluetooth: web: Rename Blacklist to Blocklist Created 4 years, 1 month 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/browser/bluetooth/bluetooth_device_chooser_controller.cc
diff --git a/content/browser/bluetooth/bluetooth_device_chooser_controller.cc b/content/browser/bluetooth/bluetooth_device_chooser_controller.cc
index 809f3a15c4dae9f7ac5979aa7245be9cae87508d..08a687f325fb3e8eed99b38fcdce97051f92a1df 100644
--- a/content/browser/bluetooth/bluetooth_device_chooser_controller.cc
+++ b/content/browser/bluetooth/bluetooth_device_chooser_controller.cc
@@ -12,7 +12,7 @@
#include "base/bind_helpers.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
-#include "content/browser/bluetooth/bluetooth_blacklist.h"
+#include "content/browser/bluetooth/bluetooth_blocklist.h"
#include "content/browser/bluetooth/bluetooth_metrics.h"
#include "content/browser/bluetooth/web_bluetooth_service_impl.h"
#include "content/public/browser/browser_thread.h"
@@ -258,15 +258,15 @@ void BluetoothDeviceChooserController::GetDevice(
options_ = std::move(options);
LogRequestDeviceOptions(options_);
- // Check blacklist to reject invalid filters and adjust optional_services.
- if (BluetoothBlacklist::Get().IsExcluded(options_->filters)) {
+ // Check blocklist to reject invalid filters and adjust optional_services.
+ if (BluetoothBlocklist::Get().IsExcluded(options_->filters)) {
RecordRequestDeviceOutcome(
- UMARequestDeviceOutcome::BLACKLISTED_SERVICE_IN_FILTER);
+ UMARequestDeviceOutcome::BLOCKLISTED_SERVICE_IN_FILTER);
PostErrorCallback(
- blink::mojom::WebBluetoothResult::REQUEST_DEVICE_WITH_BLACKLISTED_UUID);
+ blink::mojom::WebBluetoothResult::REQUEST_DEVICE_WITH_BLOCKLISTED_UUID);
return;
}
- BluetoothBlacklist::Get().RemoveExcludedUUIDs(options_.get());
+ BluetoothBlocklist::Get().RemoveExcludedUUIDs(options_.get());
const url::Origin requesting_origin =
render_frame_host_->GetLastCommittedOrigin();

Powered by Google App Engine
This is Rietveld 408576698