MD Settings: Update Bluetooth toggle UI to match spec.

chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

 // Copyright 2015 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/ui/webui/settings/md_settings_localized_strings_provider.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/i18n/number_formatting.h"
@@ skipping 51 matching lines @@
                              LocalizedString localized_strings[],
                              size_t num_strings) {
   for (size_t i = 0; i < num_strings; i++) {
     html_source->AddLocalizedString(localized_strings[i].name,
                                     localized_strings[i].id);
   }
 }
 
 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));
 
   html_source->AddBoolean(
       "isGuest",
 #if defined(OS_CHROMEOS)
       user_manager::UserManager::Get()->IsLoggedInAsGuest() ||
       user_manager::UserManager::Get()->IsLoggedInAsPublicAccount());
 #else
@@ skipping 228 matching lines @@
 
 #if defined(OS_CHROMEOS)
 void AddBluetoothStrings(content::WebUIDataSource* html_source) {
   LocalizedString localized_strings[] = {
       {"bluetoothAccept", IDS_OPTIONS_SETTINGS_BLUETOOTH_ACCEPT_PASSKEY},
       {"bluetoothConnected", IDS_SETTINGS_BLUETOOTH_CONNECTED},
       {"bluetoothConnecting", IDS_SETTINGS_BLUETOOTH_CONNECTING},
       {"bluetoothDeviceListPaired", IDS_SETTINGS_BLUETOOTH_DEVICE_LIST_PAIRED},
       {"bluetoothDeviceListUnpaired",
        IDS_SETTINGS_BLUETOOTH_DEVICE_LIST_UNPAIRED},
-      {"bluetoothDisabled", IDS_SETTINGS_BLUETOOTH_DISABLED},

[fukino, 2017/02/28 02:37:09]

Could you remove the string id from settings_strings.grpd?

[stevenjb, 2017/02/28 03:04:42]

Oops, thanks done.

       {"bluetoothDisconnect", IDS_OPTIONS_SETTINGS_BLUETOOTH_DISCONNECT},
       {"bluetoothDismiss", IDS_OPTIONS_SETTINGS_BLUETOOTH_DISMISS_ERROR},
-      {"bluetoothEnabled", IDS_SETTINGS_BLUETOOTH_ENABLED},

[fukino, 2017/02/28 02:37:09]

ditto

[stevenjb, 2017/02/28 03:04:42]

Done.

       {"bluetoothToggleA11yLabel",
        IDS_SETTINGS_BLUETOOTH_TOGGLE_ACCESSIBILITY_LABEL},
       {"bluetoothExpandA11yLabel",
        IDS_SETTINGS_BLUETOOTH_EXPAND_ACCESSIBILITY_LABEL},
       {"bluetoothNoDevices", IDS_SETTINGS_BLUETOOTH_NO_DEVICES},
       {"bluetoothNoDevicesFound", IDS_SETTINGS_BLUETOOTH_NO_DEVICES_FOUND},
       {"bluetoothNotConnected", IDS_SETTINGS_BLUETOOTH_NOT_CONNECTED},
-      {"bluetoothOff", IDS_SETTINGS_BLUETOOTH_OFF},

[fukino, 2017/02/28 02:37:09]

ditto

[stevenjb, 2017/02/28 03:04:42]

Done.

-      {"bluetoothOn", IDS_SETTINGS_BLUETOOTH_ON},
       {"bluetoothPageTitle", IDS_SETTINGS_BLUETOOTH},
       {"bluetoothPair", IDS_SETTINGS_BLUETOOTH_PAIR},
       {"bluetoothPairDevicePageTitle",
        IDS_SETTINGS_BLUETOOTH_PAIR_DEVICE_TITLE},
       {"bluetoothReject", IDS_OPTIONS_SETTINGS_BLUETOOTH_REJECT_PASSKEY},
       {"bluetoothRemove", IDS_SETTINGS_BLUETOOTH_REMOVE},
       // Device connecting and pairing.
       {"bluetoothStartConnecting", IDS_SETTINGS_BLUETOOTH_START_CONNECTING},
       {"bluetoothEnterKey", IDS_OPTIONS_SETTINGS_BLUETOOTH_ENTER_KEY},
       // These ids are generated in JS using 'bluetooth_' + a value from
@@ skipping 1602 matching lines @@
 
 #if defined(OS_CHROMEOS)
   chromeos::network_element::AddLocalizedStrings(html_source);
 #endif
   policy_indicator::AddLocalizedStrings(html_source);
 
   html_source->SetJsonPath(kLocalizedStringsFile);
 }
 
 }  // namespace settings