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

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

Issue 2017393002: bluetooth: Rename device's GetName to GetNameForDisplay (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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/browser/bluetooth/web_bluetooth_service_impl.cc
diff --git a/content/browser/bluetooth/web_bluetooth_service_impl.cc b/content/browser/bluetooth/web_bluetooth_service_impl.cc
index f2fa91880cb70c87cd37ae5ebe7ee73796bf0017..ebce72107510ebf248bc59dc5c8a50c4b1cb6d9d 100644
--- a/content/browser/bluetooth/web_bluetooth_service_impl.cc
+++ b/content/browser/bluetooth/web_bluetooth_service_impl.cc
@@ -721,7 +721,7 @@ void WebBluetoothServiceImpl::OnGetDeviceSuccess(
const std::string device_id_for_origin =
allowed_devices_map_.AddDevice(GetOrigin(), device_address, options);
- VLOG(1) << "Device: " << device->GetName();
+ VLOG(1) << "Device: " << device->GetNameForDisplay();
VLOG(1) << "UUIDs: ";
mojo::Array<mojo::String> filtered_uuids;
@@ -738,7 +738,8 @@ void WebBluetoothServiceImpl::OnGetDeviceSuccess(
blink::mojom::WebBluetoothDevicePtr device_ptr =
blink::mojom::WebBluetoothDevice::New();
device_ptr->id = device_id_for_origin;
- device_ptr->name = base::UTF16ToUTF8(device->GetName());
+ // TODO(615720): Use the upcoming GetName (was GetDeviceName).
+ device_ptr->name = base::UTF16ToUTF8(device->GetNameForDisplay());
device_ptr->uuids = std::move(filtered_uuids);
RecordRequestDeviceOutcome(UMARequestDeviceOutcome::SUCCESS);
« no previous file with comments | « content/browser/bluetooth/bluetooth_device_chooser_controller.cc ('k') | device/bluetooth/bluetooth_device.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698