components/pairing/bluetooth_controller_pairing_controller.cc - Issue 2017393002: bluetooth: Rename device's GetName to GetNameForDisplay

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: components/pairing/bluetooth_controller_pairing_controller.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

« no previous file with comments | « components/arc/bluetooth/arc_bluetooth_bridge.cc ('k') | components/proximity_auth/ble/bluetooth_low_energy_connection_finder_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/pairing/bluetooth_controller_pairing_controller.cc

diff --git a/components/pairing/bluetooth_controller_pairing_controller.cc b/components/pairing/bluetooth_controller_pairing_controller.cc

index dd2ea5411d553cb9a816ba6be6b9f8b31127708d..8750de39aef95d7bdb4fffcce919df679e5e3c18 100644

--- a/components/pairing/bluetooth_controller_pairing_controller.cc

+++ b/components/pairing/bluetooth_controller_pairing_controller.cc

@@ -72,7 +72,8 @@ void BluetoothControllerPairingController::DeviceFound(

device::BluetoothDevice* device) {

DCHECK_EQ(current_stage_, STAGE_DEVICES_DISCOVERY);

DCHECK(thread_checker_.CalledOnValidThread());

- if (base::StartsWith(device->GetName(), base::ASCIIToUTF16(kDeviceNamePrefix),

+ if (base::StartsWith(device->GetNameForDisplay(),

+ base::ASCIIToUTF16(kDeviceNamePrefix),

base::CompareCase::INSENSITIVE_ASCII)) {

discovered_devices_.insert(device->GetAddress());

FOR_EACH_OBSERVER(ControllerPairingController::Observer, observers_,