| Index: chrome/browser/chromeos/login/screens/hid_detection_screen.cc
|
| diff --git a/chrome/browser/chromeos/login/screens/hid_detection_screen.cc b/chrome/browser/chromeos/login/screens/hid_detection_screen.cc
|
| index c76d7fc58f2dff20fbcd148e6dcc456e27efaddb..56755971b0a34e171bf53c334b8091923846c132 100644
|
| --- a/chrome/browser/chromeos/login/screens/hid_detection_screen.cc
|
| +++ b/chrome/browser/chromeos/login/screens/hid_detection_screen.cc
|
| @@ -165,29 +165,29 @@ void HIDDetectionScreen::OnViewDestroyed(HIDDetectionView* view) {
|
|
|
| void HIDDetectionScreen::RequestPinCode(device::BluetoothDevice* device) {
|
| VLOG(1) << "RequestPinCode id = " << device->GetDeviceID()
|
| - << " name = " << device->GetName();
|
| + << " name = " << device->GetNameForDisplay();
|
| device->CancelPairing();
|
| }
|
|
|
| void HIDDetectionScreen::RequestPasskey(device::BluetoothDevice* device) {
|
| VLOG(1) << "RequestPassKey id = " << device->GetDeviceID()
|
| - << " name = " << device->GetName();
|
| + << " name = " << device->GetNameForDisplay();
|
| device->CancelPairing();
|
| }
|
|
|
| void HIDDetectionScreen::DisplayPinCode(device::BluetoothDevice* device,
|
| const std::string& pincode) {
|
| VLOG(1) << "DisplayPinCode id = " << device->GetDeviceID()
|
| - << " name = " << device->GetName();
|
| + << " name = " << device->GetNameForDisplay();
|
| GetContextEditor().SetString(kContextKeyPinCode, pincode);
|
| - SetKeyboardDeviceName_(base::UTF16ToUTF8(device->GetName()));
|
| + SetKeyboardDeviceName_(base::UTF16ToUTF8(device->GetNameForDisplay()));
|
| SendKeyboardDeviceNotification();
|
| }
|
|
|
| void HIDDetectionScreen::DisplayPasskey(device::BluetoothDevice* device,
|
| uint32_t passkey) {
|
| VLOG(1) << "DisplayPassKey id = " << device->GetDeviceID()
|
| - << " name = " << device->GetName();
|
| + << " name = " << device->GetNameForDisplay();
|
| std::string pincode = base::UintToString(passkey);
|
| pincode = std::string(kPincodeLength - pincode.length(), '0').append(pincode);
|
| // No differences in UI for passkey and pincode authentication calls.
|
| @@ -374,24 +374,24 @@ void HIDDetectionScreen::SetKeyboardDeviceName_(const std::string& name) {
|
|
|
| void HIDDetectionScreen::DeviceAdded(
|
| device::BluetoothAdapter* adapter, device::BluetoothDevice* device) {
|
| - VLOG(1) << "BT input device added id = " << device->GetDeviceID() <<
|
| - " name = " << device->GetName();
|
| + VLOG(1) << "BT input device added id = " << device->GetDeviceID()
|
| + << " name = " << device->GetNameForDisplay();
|
| TryPairingAsPointingDevice(device);
|
| TryPairingAsKeyboardDevice(device);
|
| }
|
|
|
| void HIDDetectionScreen::DeviceChanged(
|
| device::BluetoothAdapter* adapter, device::BluetoothDevice* device) {
|
| - VLOG(1) << "BT device changed id = " << device->GetDeviceID() << " name = " <<
|
| - device->GetName();
|
| + VLOG(1) << "BT device changed id = " << device->GetDeviceID()
|
| + << " name = " << device->GetNameForDisplay();
|
| TryPairingAsPointingDevice(device);
|
| TryPairingAsKeyboardDevice(device);
|
| }
|
|
|
| void HIDDetectionScreen::DeviceRemoved(
|
| device::BluetoothAdapter* adapter, device::BluetoothDevice* device) {
|
| - VLOG(1) << "BT device removed id = " << device->GetDeviceID() << " name = " <<
|
| - device->GetName();
|
| + VLOG(1) << "BT device removed id = " << device->GetDeviceID()
|
| + << " name = " << device->GetNameForDisplay();
|
| }
|
|
|
| void HIDDetectionScreen::OnInputDeviceAdded(
|
|
|