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

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

Issue 2725463002: MD Settings: Update Bluetooth toggle UI to match spec. (Closed)
Patch Set: Elim unused IDS Created 3 years, 10 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 886fab62d766f3d110ab5225b4d92b4351c5dbf0..70aed11cf3952432937d6ff128ed258e92251382 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
@@ -69,24 +69,28 @@ void AddLocalizedStringsBulk(content::WebUIDataSource* html_source,
void AddCommonStrings(content::WebUIDataSource* html_source, Profile* profile) {
LocalizedString localized_strings[] = {
- {"add", IDS_ADD},
- {"advancedPageTitle", IDS_SETTINGS_ADVANCED},
- {"back", IDS_ACCNAME_BACK},
- {"basicPageTitle", IDS_SETTINGS_BASIC},
- {"cancel", IDS_CANCEL},
- {"close", IDS_CLOSE},
- {"confirm", IDS_CONFIRM},
- {"controlledByExtension", IDS_SETTINGS_CONTROLLED_BY_EXTENSION},
- {"disable", IDS_DISABLE},
- {"done", IDS_DONE},
- {"edit", IDS_SETTINGS_EDIT},
- {"learnMore", IDS_LEARN_MORE},
- {"menuButtonLabel", IDS_SETTINGS_MENU_BUTTON_LABEL},
- {"moreActions", IDS_SETTINGS_MORE_ACTIONS},
- {"ok", IDS_OK},
- {"restart", IDS_SETTINGS_RESTART},
- {"save", IDS_SAVE},
- {"settings", IDS_SETTINGS_SETTINGS},
+ {"add", IDS_ADD},
+ {"advancedPageTitle", IDS_SETTINGS_ADVANCED},
+ {"back", IDS_ACCNAME_BACK},
+ {"basicPageTitle", IDS_SETTINGS_BASIC},
+ {"cancel", IDS_CANCEL},
+ {"close", IDS_CLOSE},
+ {"confirm", IDS_CONFIRM},
+ {"controlledByExtension", IDS_SETTINGS_CONTROLLED_BY_EXTENSION},
+#if defined(OS_CHROMEOS)
+ {"deviceOff", IDS_SETTINGS_DEVICE_OFF},
+ {"deviceOn", IDS_SETTINGS_DEVICE_ON},
+#endif
+ {"disable", IDS_DISABLE},
+ {"done", IDS_DONE},
+ {"edit", IDS_SETTINGS_EDIT},
+ {"learnMore", IDS_LEARN_MORE},
+ {"menuButtonLabel", IDS_SETTINGS_MENU_BUTTON_LABEL},
+ {"moreActions", IDS_SETTINGS_MORE_ACTIONS},
+ {"ok", IDS_OK},
+ {"restart", IDS_SETTINGS_RESTART},
+ {"save", IDS_SAVE},
+ {"settings", IDS_SETTINGS_SETTINGS},
};
AddLocalizedStringsBulk(html_source, localized_strings,
arraysize(localized_strings));
@@ -335,10 +339,8 @@ void AddBluetoothStrings(content::WebUIDataSource* html_source) {
{"bluetoothDeviceListPaired", IDS_SETTINGS_BLUETOOTH_DEVICE_LIST_PAIRED},
{"bluetoothDeviceListUnpaired",
IDS_SETTINGS_BLUETOOTH_DEVICE_LIST_UNPAIRED},
- {"bluetoothDisabled", IDS_SETTINGS_BLUETOOTH_DISABLED},
{"bluetoothDisconnect", IDS_OPTIONS_SETTINGS_BLUETOOTH_DISCONNECT},
{"bluetoothDismiss", IDS_OPTIONS_SETTINGS_BLUETOOTH_DISMISS_ERROR},
- {"bluetoothEnabled", IDS_SETTINGS_BLUETOOTH_ENABLED},
{"bluetoothToggleA11yLabel",
IDS_SETTINGS_BLUETOOTH_TOGGLE_ACCESSIBILITY_LABEL},
{"bluetoothExpandA11yLabel",
@@ -346,8 +348,6 @@ void AddBluetoothStrings(content::WebUIDataSource* html_source) {
{"bluetoothNoDevices", IDS_SETTINGS_BLUETOOTH_NO_DEVICES},
{"bluetoothNoDevicesFound", IDS_SETTINGS_BLUETOOTH_NO_DEVICES_FOUND},
{"bluetoothNotConnected", IDS_SETTINGS_BLUETOOTH_NOT_CONNECTED},
- {"bluetoothOff", IDS_SETTINGS_BLUETOOTH_OFF},
- {"bluetoothOn", IDS_SETTINGS_BLUETOOTH_ON},
{"bluetoothPageTitle", IDS_SETTINGS_BLUETOOTH},
{"bluetoothPair", IDS_SETTINGS_BLUETOOTH_PAIR},
{"bluetoothPairDevicePageTitle",

Powered by Google App Engine
This is Rietveld 408576698