bluetooth: Rename device's GetName to GetNameForDisplay

chrome/browser/chromeos/login/screens/hid_detection_screen.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/screens/hid_detection_screen.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/metrics/histogram.h"
@@ skipping 147 matching lines @@
                  on_check_done));
 }
 
 void HIDDetectionScreen::OnViewDestroyed(HIDDetectionView* view) {
   if (view_ == view)
     view_ = NULL;
 }
 
 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.
   DisplayPinCode(device, pincode);
 }
 
 void HIDDetectionScreen::KeysEntered(device::BluetoothDevice* device,
                                      uint32_t entered) {
   VLOG(1) << "Number of keys entered " << entered;
   GetContextEditor()
@@ skipping 166 matching lines @@
 
 void HIDDetectionScreen::SetKeyboardDeviceName_(const std::string& name) {
   keyboard_device_name_ =
       keyboard_device_id_.empty() || !name.empty()
           ? name
           : l10n_util::GetStringUTF8(IDS_HID_DETECTION_DEFAULT_KEYBOARD_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(
     const InputDeviceInfo& info) {
   VLOG(1) << "Input device added id = " << info.id << " name = " << info.name;
   // TODO(merkulova): deal with all available device types, e.g. joystick.
   if (!keyboard_device_id_.empty() && !pointing_device_id_.empty())
     return;
 
   if (pointing_device_id_.empty() && DeviceIsPointing(info)) {
@@ skipping 141 matching lines @@
 void HIDDetectionScreen::SetPoweredOffError() {
   LOG(ERROR) << "Failed to power off BT adapter";
 }
 
 void HIDDetectionScreen::FindDevicesError() {
   VLOG(1) << "Failed to start Bluetooth discovery.";
 }
 
 
 }  // namespace chromeos