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

Unified Diff: chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

Issue 2146553005: MD Settings: Bluetooth: Add error dialog and messages (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@issue_602538_bluetooth_fixes_0
Patch Set: Feedback Created 4 years, 5 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: chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
diff --git a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
index 5c15eaf9b3eb1ac978b0d8e361391e478f5428cc..b1bc979a2e212b6a51dce9eec0093bfeeeffe7c7 100644
--- a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
+++ b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
@@ -240,22 +240,20 @@ void AddAppearanceStrings(content::WebUIDataSource* html_source) {
#if defined(OS_CHROMEOS)
void AddBluetoothStrings(content::WebUIDataSource* html_source) {
LocalizedString localized_strings[] = {
- {"bluetoothPageTitle", IDS_SETTINGS_BLUETOOTH},
- {"bluetoothAddDevicePageTitle", IDS_SETTINGS_BLUETOOTH_ADD_DEVICE},
- {"bluetoothPairDevicePageTitle", IDS_SETTINGS_BLUETOOTH_PAIR_DEVICE},
- {"bluetoothEnable", IDS_SETTINGS_BLUETOOTH_ENABLE},
- {"bluetoothConnect", IDS_OPTIONS_SETTINGS_BLUETOOTH_CONNECT},
+ {"bluetoothAccept", IDS_OPTIONS_SETTINGS_BLUETOOTH_ACCEPT_PASSKEY},
{"bluetoothAddDevice", IDS_OPTIONS_SETTINGS_ADD_BLUETOOTH_DEVICE},
- {"bluetoothNoDevices", IDS_OPTIONS_SETTINGS_BLUETOOTH_NO_DEVICES},
+ {"bluetoothAddDevicePageTitle", IDS_SETTINGS_BLUETOOTH_ADD_DEVICE},
{"bluetoothConnect", IDS_OPTIONS_SETTINGS_BLUETOOTH_CONNECT},
+ {"bluetoothConnecting", IDS_SETTINGS_BLUETOOTH_CONNECTING},
{"bluetoothDisconnect", IDS_OPTIONS_SETTINGS_BLUETOOTH_DISCONNECT},
- {"bluetoothConnecting", IDS_OPTIONS_SETTINGS_BLUETOOTH_CONNECTING},
+ {"bluetoothDismiss", IDS_OPTIONS_SETTINGS_BLUETOOTH_DISMISS_ERROR},
+ {"bluetoothEnable", IDS_SETTINGS_BLUETOOTH_ENABLE},
+ {"bluetoothNoDevices", IDS_OPTIONS_SETTINGS_BLUETOOTH_NO_DEVICES},
+ {"bluetoothPageTitle", IDS_SETTINGS_BLUETOOTH},
+ {"bluetoothPairDevicePageTitle", IDS_SETTINGS_BLUETOOTH_PAIR_DEVICE},
+ {"bluetoothReject", IDS_OPTIONS_SETTINGS_BLUETOOTH_REJECT_PASSKEY},
{"bluetoothRemove", IDS_SETTINGS_BLUETOOTH_REMOVE},
{"bluetoothScanning", IDS_OPTIONS_SETTINGS_BLUETOOTH_SCANNING},
- {"bluetoothAccept", IDS_OPTIONS_SETTINGS_BLUETOOTH_ACCEPT_PASSKEY},
- {"bluetoothReject", IDS_OPTIONS_SETTINGS_BLUETOOTH_REJECT_PASSKEY},
- {"bluetoothConnect", IDS_OPTIONS_SETTINGS_BLUETOOTH_CONNECT},
- {"bluetoothDismiss", IDS_OPTIONS_SETTINGS_BLUETOOTH_DISMISS_ERROR},
// Device connecting and pairing.
{"bluetoothStartConnecting", IDS_SETTINGS_BLUETOOTH_START_CONNECTING},
{"bluetoothEnterKey", IDS_OPTIONS_SETTINGS_BLUETOOTH_ENTER_KEY},
@@ -267,6 +265,35 @@ void AddBluetoothStrings(content::WebUIDataSource* html_source) {
{"bluetooth_requestPasskey", IDS_SETTINGS_BLUETOOTH_REQUEST_PASSKEY},
{"bluetooth_displayPasskey", IDS_SETTINGS_BLUETOOTH_DISPLAY_PASSKEY},
{"bluetooth_confirmPasskey", IDS_SETTINGS_BLUETOOTH_CONFIRM_PASSKEY},
+ // These ids are generated in JS using 'bluetooth_result_' + a value from
+ // bluetoothPrivate.ConnectResultType (see bluetooth_private.idl).
+ {"bluetooth_connect_attributeLengthInvalid",
+ IDS_SETTINGS_BLUETOOTH_CONNECT_ATTRIBUTE_LENGTH_INVALID},
+ {"bluetooth_connect_authCanceled",
+ IDS_SETTINGS_BLUETOOTH_CONNECT_AUTH_CANCELED},
+ {"bluetooth_connect_authFailed",
+ IDS_SETTINGS_BLUETOOTH_CONNECT_AUTH_FAILED},
+ {"bluetooth_connect_authRejected",
+ IDS_SETTINGS_BLUETOOTH_CONNECT_AUTH_REJECTED},
+ {"bluetooth_connect_authTimeout",
+ IDS_SETTINGS_BLUETOOTH_CONNECT_AUTH_TIMEOUT},
+ {"bluetooth_connect_connectionCongested",
+ IDS_SETTINGS_BLUETOOTH_CONNECT_CONNECTION_CONGESTED},
+ {"bluetooth_connect_failed", IDS_SETTINGS_BLUETOOTH_CONNECT_FAILED},
+ {"bluetooth_connect_inProgress",
+ IDS_SETTINGS_BLUETOOTH_CONNECT_IN_PROGRESS},
+ {"bluetooth_connect_insufficientEncryption",
+ IDS_SETTINGS_BLUETOOTH_CONNECT_INSUFFICIENT_ENCRYPTION},
+ {"bluetooth_connect_offsetInvalid",
+ IDS_SETTINGS_BLUETOOTH_CONNECT_OFFSET_INVALID},
+ {"bluetooth_connect_readNotPermitted",
+ IDS_SETTINGS_BLUETOOTH_CONNECT_READ_NOT_PERMITTED},
+ {"bluetooth_connect_requestNotSupported",
+ IDS_SETTINGS_BLUETOOTH_CONNECT_REQUEST_NOT_SUPPORTED},
+ {"bluetooth_connect_unsupportedDevice",
+ IDS_SETTINGS_BLUETOOTH_CONNECT_UNSUPPORTED_DEVICE},
+ {"bluetooth_connect_writeNotPermitted",
+ IDS_SETTINGS_BLUETOOTH_CONNECT_WRITE_NOT_PERMITTED},
};
AddLocalizedStringsBulk(html_source, localized_strings,
arraysize(localized_strings));
« no previous file with comments | « chrome/browser/resources/settings/bluetooth_page/bluetooth_page.js ('k') | chrome/test/data/webui/i18n_behavior_test.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698