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

Unified Diff: components/arc/bluetooth/arc_bluetooth_bridge.cc

Issue 2020923002: bluetooth: Update ARC Bridge to use BluetoothDevice::GetName (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bt-filter-by-empty-name-
Patch Set: Created 4 years, 5 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/arc/bluetooth/arc_bluetooth_bridge.cc
diff --git a/components/arc/bluetooth/arc_bluetooth_bridge.cc b/components/arc/bluetooth/arc_bluetooth_bridge.cc
index fb716aca60ea93b031c0f2f2ad7cf2d99bb6217c..1c85deb3d1c8f4fb0dceb238e520bfad9607f3c4 100644
--- a/components/arc/bluetooth/arc_bluetooth_bridge.cc
+++ b/components/arc/bluetooth/arc_bluetooth_bridge.cc
@@ -1372,12 +1372,11 @@ ArcBluetoothBridge::GetDeviceProperties(mojom::BluetoothPropertyType type,
return properties;
}
- if (type == mojom::BluetoothPropertyType::ALL ||
- type == mojom::BluetoothPropertyType::BDNAME) {
+ if ((type == mojom::BluetoothPropertyType::ALL ||
+ type == mojom::BluetoothPropertyType::BDNAME) &&
+ device->GetName()) {
mojom::BluetoothPropertyPtr btp = mojom::BluetoothProperty::New();
- // TODO(615720): Use the upcoming GetName (was GetDeviceName).
- btp->set_bdname(
- mojo::String::From(base::UTF16ToUTF8(device->GetNameForDisplay())));
+ btp->set_bdname(mojo::String::From(device->GetName().value()));
properties.push_back(std::move(btp));
}
if (type == mojom::BluetoothPropertyType::ALL ||
@@ -1415,7 +1414,6 @@ ArcBluetoothBridge::GetDeviceProperties(mojom::BluetoothPropertyType type,
if (type == mojom::BluetoothPropertyType::ALL ||
type == mojom::BluetoothPropertyType::REMOTE_FRIENDLY_NAME) {
mojom::BluetoothPropertyPtr btp = mojom::BluetoothProperty::New();
- // TODO(615720): Use the upcoming GetName (was GetDeviceName).
btp->set_remote_friendly_name(
mojo::String::From(base::UTF16ToUTF8(device->GetNameForDisplay())));
properties.push_back(std::move(btp));
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698