Combine on/off strings for Chrome OS OOBE.

This reduces duplication of strings.

Change-Id: I8c075f81282f63d151273e7704458afbe666b36f
Reviewed-on: https://chromium-review.googlesource.com/1185896Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Commit-Queue: Katie Dektar <katie@chromium.org>
Cr-Commit-Position: refs/heads/master@{#590166}

chrome/app/chromeos_strings.grdp

@@ -460,21 +460,15 @@
   <message name="IDS_OOBE_SPOKEN_FEEDBACK_OPTION" desc="Spoken feedback option shown on OOBE screens accessibility menu.">
     ChromeVox (spoken feedback)
   </message>
-  <message name="IDS_SPOKEN_FEEDBACK_OPTION_OFF" desc="A value for Spoken Feedback accessibility option when it is off.">
+  <message name="IDS_A11Y_SETTING_TOGGLE_OPTION_OFF" desc="A value for an accessibility toggle option when it is off.">
     Off
   </message>
-  <message name="IDS_SPOKEN_FEEDBACK_OPTION_ON" desc="A value for Spoken Feedback accessibility option when it is on.">
+  <message name="IDS_A11Y_SETTING_TOGGLE_OPTION_ON" desc="A value for an accessibility toggle option when it is on.">
     On
   </message>
   <message name="IDS_OOBE_SELECT_TO_SPEAK_OPTION" desc="Select to Speak option shown on OOBE screens accessibility menu.">
     Select to speak
   </message>
-  <message name="IDS_SELECT_TO_SPEAK_OPTION_OFF" desc="A value for Select to Speak accessibility option when it is off.">
-    Off
-  </message>
-  <message name="IDS_SELECT_TO_SPEAK_OPTION_ON" desc="A value for Select to Speak accessibility option when it is on.">
-    On
-  </message>
   <message name="IDS_OOBE_LARGE_CURSOR_OPTION" desc="Large mouse cursor option shown on OOBE screens accessibility menu.">
     Large mouse cursor
   </message>
@@ -487,33 +481,15 @@
   <message name="IDS_OOBE_HIGH_CONTRAST_MODE_OPTION" desc="High contrast mode option shown on OOBE screens accessibility menu.">
     High contrast mode
   </message>
-  <message name="IDS_HIGH_CONTRAST_OPTION_OFF" desc="A value for High Contrast Mode accessibility option when it is off.">
-    Off
-  </message>
-  <message name="IDS_HIGH_CONTRAST_OPTION_ON" desc="A value for High Contrast Mode accessibility option when it is on.">
-    On
-  </message>
   <message name="IDS_OOBE_SCREEN_MAGNIFIER_OPTION" desc="Screen magnifier option shown on OOBE screens accessibility menu.">
     Screen magnifier
   </message>
   <message name="IDS_OOBE_DOCKED_MAGNIFIER_OPTION" desc="Docked magnifier option shown on OOBE screens accessibility menu.">
     Docked magnifier
   </message>
-  <message name="IDS_SCREEN_MAGNIFIER_OPTION_OFF" desc="A value for Screen or Docked Magnifier Option accessibility option when it is off.">
-    Off
-  </message>
-  <message name="IDS_SCREEN_MAGNIFIER_OPTION_ON" desc="A value for Screen or Docked Magnifier Option accessibility option when it is on.">
-    On
-  </message>
   <message name="IDS_OOBE_VIRTUAL_KEYBOARD_OPTION" desc="Virtual keyboard option shown on the OOBE screens accessibility menu.">
     On-screen keyboard
   </message>
-  <message name="IDS_VIRTUAL_KEYBOARD_OPTION_OFF" desc="A value for Virtual Keyboard accessibility option when it is off.">
-    Off
-  </message>
-  <message name="IDS_VIRTUAL_KEYBOARD_OPTION_ON" desc="A value for Virtual Keyboard accessibility option when it is on.">
-    On
-  </message>
   <message name="IDS_OOBE_CLOSE_ACCESSIBILITY_MENU" desc="Text to be spoken when focus is set to the close button of accessibility options menu.">
     Close accessibility menu
   </message>

chrome/app/chromeos_strings_grdp/IDS_A11Y_SETTING_TOGGLE_OPTION_OFF.png.sha1

+44b98cfab5294732f879f34bbe55275c3f103be8
\ No newline at end of file

chrome/app/chromeos_strings_grdp/IDS_A11Y_SETTING_TOGGLE_OPTION_ON.png.sha1

+3f3322f68a3cccaed74733641227c0fbd9194907
\ No newline at end of file

chrome/app/chromeos_strings_grdp/IDS_SELECT_TO_SPEAK_OPTION_OFF.png.sha1

-436d213dcaafc071f6631e6d497dfa37c5ad5bbc
\ No newline at end of file

chrome/app/chromeos_strings_grdp/IDS_SELECT_TO_SPEAK_OPTION_ON.png.sha1

-d04d627bb29da9efd1172f6792ba930f7e7c435a
\ No newline at end of file

chrome/browser/resources/chromeos/login/oobe_welcome.html

@@ -130,10 +130,10 @@
             [[i18nDynamic(locale, 'spokenFeedbackOption')]]
           </span>
           <span slot="checked-value">
-            [[i18nDynamic(locale, 'spokenFeedbackOptionOn')]]
+            [[i18nDynamic(locale, 'a11ySettingToggleOptionOn')]]
           </span>
           <span slot="unchecked-value">
-            [[i18nDynamic(locale, 'spokenFeedbackOptionOff')]]
+            [[i18nDynamic(locale, 'a11ySettingToggleOptionOff')]]
           </span>
         </oobe-a11y-option>
         <oobe-a11y-option checked="[[a11yStatus.largeCursorEnabled]]"
@@ -156,10 +156,10 @@
             [[i18nDynamic(locale, 'highContrastOption')]]
           </span>
           <span slot="checked-value">
-            [[i18nDynamic(locale, 'highContrastOptionOn')]]
+            [[i18nDynamic(locale, 'a11ySettingToggleOptionOn')]]
           </span>
           <span slot="unchecked-value">
-            [[i18nDynamic(locale, 'highContrastOptionOff')]]
+            [[i18nDynamic(locale, 'a11ySettingToggleOptionOff')]]
           </span>
         </oobe-a11y-option>
         <oobe-a11y-option checked="[[a11yStatus.screenMagnifierEnabled]]"
@@ -170,10 +170,10 @@
             [[i18nDynamic(locale, 'screenMagnifierOption')]]
           </span>
           <span slot="checked-value">
-            [[i18nDynamic(locale, 'screenMagnifierOptionOn')]]
+            [[i18nDynamic(locale, 'a11ySettingToggleOptionOn')]]
           </span>
           <span slot="unchecked-value">
-            [[i18nDynamic(locale, 'screenMagnifierOptionOff')]]
+            [[i18nDynamic(locale, 'a11ySettingToggleOptionOff')]]
           </span>
         </oobe-a11y-option>
         <oobe-a11y-option checked="[[a11yStatus.selectToSpeakEnabled]]"
@@ -186,10 +186,10 @@
             [[i18nDynamic(locale, 'selectToSpeakOption')]]
           </span>
           <span slot="checked-value">
-            [[i18nDynamic(locale, 'selectToSpeakOptionOn')]]
+            [[i18nDynamic(locale, 'a11ySettingToggleOptionOn')]]
           </span>
           <span slot="unchecked-value">
-            [[i18nDynamic(locale, 'selectToSpeakOptionOff')]]
+            [[i18nDynamic(locale, 'a11ySettingToggleOptionOff')]]
           </span>
         </oobe-a11y-option>
         <oobe-a11y-option checked="[[a11yStatus.dockedMagnifierEnabled]]"
@@ -202,10 +202,10 @@
             [[i18nDynamic(locale, 'dockedMagnifierOption')]]
           </span>
           <span slot="checked-value">
-            [[i18nDynamic(locale, 'screenMagnifierOptionOn')]]
+            [[i18nDynamic(locale, 'a11ySettingToggleOptionOn')]]
           </span>
           <span slot="unchecked-value">
-            [[i18nDynamic(locale, 'screenMagnifierOptionOff')]]
+            [[i18nDynamic(locale, 'a11ySettingToggleOptionOff')]]
           </span>
         </oobe-a11y-option>
         <oobe-a11y-option checked="[[a11yStatus.virtualKeyboardEnabled]]"
@@ -216,10 +216,10 @@
             [[i18nDynamic(locale, 'virtualKeyboardOption')]]
           </span>
           <span slot="checked-value">
-            [[i18nDynamic(locale, 'virtualKeyboardOptionOn')]]
+            [[i18nDynamic(locale, 'a11ySettingToggleOptionOn')]]
           </span>
           <span slot="unchecked-value">
-            [[i18nDynamic(locale, 'virtualKeyboardOptionOff')]]
+            [[i18nDynamic(locale, 'a11ySettingToggleOptionOff')]]
           </span>
         </oobe-a11y-option>
       </div>

chrome/browser/ui/webui/chromeos/login/welcome_screen_handler.cc

@@ -147,18 +147,11 @@ void WelcomeScreenHandler::DeclareLocalizedValues(
   builder->Add("keyboardDropdownTitle", IDS_KEYBOARD_DROPDOWN_TITLE);
   builder->Add("keyboardDropdownLabel", IDS_KEYBOARD_DROPDOWN_LABEL);
 
-  builder->Add("highContrastOptionOff", IDS_HIGH_CONTRAST_OPTION_OFF);
-  builder->Add("highContrastOptionOn", IDS_HIGH_CONTRAST_OPTION_ON);
+  builder->Add("a11ySettingToggleOptionOff",
+               IDS_A11Y_SETTING_TOGGLE_OPTION_OFF);
+  builder->Add("a11ySettingToggleOptionOn", IDS_A11Y_SETTING_TOGGLE_OPTION_ON);
   builder->Add("largeCursorOptionOff", IDS_LARGE_CURSOR_OPTION_OFF);
   builder->Add("largeCursorOptionOn", IDS_LARGE_CURSOR_OPTION_ON);
-  builder->Add("screenMagnifierOptionOff", IDS_SCREEN_MAGNIFIER_OPTION_OFF);
-  builder->Add("screenMagnifierOptionOn", IDS_SCREEN_MAGNIFIER_OPTION_ON);
-  builder->Add("spokenFeedbackOptionOff", IDS_SPOKEN_FEEDBACK_OPTION_OFF);
-  builder->Add("spokenFeedbackOptionOn", IDS_SPOKEN_FEEDBACK_OPTION_ON);
-  builder->Add("selectToSpeakOptionOff", IDS_SELECT_TO_SPEAK_OPTION_OFF);
-  builder->Add("selectToSpeakOptionOn", IDS_SELECT_TO_SPEAK_OPTION_ON);
-  builder->Add("virtualKeyboardOptionOff", IDS_VIRTUAL_KEYBOARD_OPTION_OFF);
-  builder->Add("virtualKeyboardOptionOn", IDS_VIRTUAL_KEYBOARD_OPTION_ON);
 
   builder->Add("timezoneDropdownTitle", IDS_TIMEZONE_DROPDOWN_TITLE);
   builder->Add("timezoneButtonText", IDS_TIMEZONE_BUTTON_TEXT);