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

Unified Diff: ash/system/chromeos/bluetooth/bluetooth_notification_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 | « no previous file | chrome/browser/chromeos/bluetooth/bluetooth_pairing_dialog.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/chromeos/bluetooth/bluetooth_notification_controller.cc
diff --git a/ash/system/chromeos/bluetooth/bluetooth_notification_controller.cc b/ash/system/chromeos/bluetooth/bluetooth_notification_controller.cc
index 42f8fb3d459b43f85f96f4a5eec8bb3939464d22..1864a1cfe512e24fc31ae0319e660b7d8b4bb1f0 100644
--- a/ash/system/chromeos/bluetooth/bluetooth_notification_controller.cc
+++ b/ash/system/chromeos/bluetooth/bluetooth_notification_controller.cc
@@ -204,8 +204,8 @@ void BluetoothNotificationController::DisplayPinCode(
BluetoothDevice* device,
const std::string& pincode) {
base::string16 message = l10n_util::GetStringFUTF16(
- IDS_ASH_STATUS_TRAY_BLUETOOTH_DISPLAY_PINCODE,
- device->GetName(), base::UTF8ToUTF16(pincode));
+ IDS_ASH_STATUS_TRAY_BLUETOOTH_DISPLAY_PINCODE,
+ device->GetNameForDisplay(), base::UTF8ToUTF16(pincode));
NotifyPairing(device, message, false);
}
@@ -213,9 +213,9 @@ void BluetoothNotificationController::DisplayPinCode(
void BluetoothNotificationController::DisplayPasskey(BluetoothDevice* device,
uint32_t passkey) {
base::string16 message = l10n_util::GetStringFUTF16(
- IDS_ASH_STATUS_TRAY_BLUETOOTH_DISPLAY_PASSKEY,
- device->GetName(), base::UTF8ToUTF16(
- base::StringPrintf("%06i", passkey)));
+ IDS_ASH_STATUS_TRAY_BLUETOOTH_DISPLAY_PASSKEY,
+ device->GetNameForDisplay(),
+ base::UTF8ToUTF16(base::StringPrintf("%06i", passkey)));
NotifyPairing(device, message, false);
}
@@ -228,9 +228,9 @@ void BluetoothNotificationController::KeysEntered(BluetoothDevice* device,
void BluetoothNotificationController::ConfirmPasskey(BluetoothDevice* device,
uint32_t passkey) {
base::string16 message = l10n_util::GetStringFUTF16(
- IDS_ASH_STATUS_TRAY_BLUETOOTH_CONFIRM_PASSKEY,
- device->GetName(), base::UTF8ToUTF16(
- base::StringPrintf("%06i", passkey)));
+ IDS_ASH_STATUS_TRAY_BLUETOOTH_CONFIRM_PASSKEY,
+ device->GetNameForDisplay(),
+ base::UTF8ToUTF16(base::StringPrintf("%06i", passkey)));
NotifyPairing(device, message, true);
}
@@ -238,8 +238,8 @@ void BluetoothNotificationController::ConfirmPasskey(BluetoothDevice* device,
void BluetoothNotificationController::AuthorizePairing(
BluetoothDevice* device) {
base::string16 message = l10n_util::GetStringFUTF16(
- IDS_ASH_STATUS_TRAY_BLUETOOTH_AUTHORIZE_PAIRING,
- device->GetName());
+ IDS_ASH_STATUS_TRAY_BLUETOOTH_AUTHORIZE_PAIRING,
+ device->GetNameForDisplay());
NotifyPairing(device, message, true);
}
@@ -334,7 +334,7 @@ void BluetoothNotificationController::NotifyPairedDevice(
message_center::NOTIFICATION_TYPE_SIMPLE,
kBluetoothDevicePairedNotificationId, base::string16() /* title */,
l10n_util::GetStringFUTF16(IDS_ASH_STATUS_TRAY_BLUETOOTH_PAIRED,
- device->GetName()),
+ device->GetNameForDisplay()),
bundle.GetImageNamed(IDR_AURA_NOTIFICATION_BLUETOOTH),
base::string16() /* display source */, GURL(),
message_center::NotifierId(message_center::NotifierId::SYSTEM_COMPONENT,
« no previous file with comments | « no previous file | chrome/browser/chromeos/bluetooth/bluetooth_pairing_dialog.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698