[omnibox] Add a11y message explaining keystroke to remove suggestion

If a suggestion has a remove suggestion button, this CL adds a voiceover
saying 'Press Tab then Enter to remove suggestion.'

If a suggestion has a remove suggestion button AND another option, the
voiceover will read 'multiple actions are available, press Tab to cycle
through them.' The Remove Suggestion button previously was not included
in the action count.

Bug: 1099798
Change-Id: I84f012d0f9d40a82a8c85214128ce25c6b4323b4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2533634Reviewed-by: Tommy Li <tommycli@chromium.org>
Reviewed-by: Aaron Leventhal <aleventhal@chromium.org>
Commit-Queue: Angela Yoeurng <yoangela@chromium.org>
Cr-Commit-Position: refs/heads/master@{#826855}

components/omnibox/browser/omnibox_popup_model.cc

@@ -612,12 +612,15 @@ base::string16 OmniboxPopupModel::GetAccessibilityLabelForCurrentSelection(
             match.pedal->GetLabelStrings().id_accessibility_suffix;
         available_actions_count++;
       }
+      if (IsControlPresentOnMatch(
+              Selection(line, FOCUSED_BUTTON_REMOVE_SUGGESTION))) {
+        additional_message_id = IDS_ACC_REMOVE_SUGGESTION_SUFFIX;
+        available_actions_count++;
+      }
       DCHECK_EQ(LINE_STATE_MAX_VALUE, 6);
       if (available_actions_count > 1)
         additional_message_id = IDS_ACC_MULTIPLE_ACTIONS_SUFFIX;
 
-      // Don't add an additional message for removable suggestions without
-      // button focus, since they are relatively common.
       break;
     }
     case KEYWORD_MODE:

components/omnibox_strings.grdp

@@ -251,7 +251,7 @@
   <message name="IDS_ACC_MULTIPLE_ACTIONS_SUFFIX" desc="Suffix for spoken suggestion description with multiple actions available (pedals, switch tab, keyword search) to indicate that this suggestion has multiple actions available.">
     <ph name="MULTIPLE_ACTIONS_FOCUSED_FRIENDLY_MATCH_TEXT">$1<ex>The Chromium Projects http://www.chromium.org bookmark</ex></ph>, multiple actions are available, press Tab to cycle through them
   </message>
-    <message name="IDS_ACC_KEYWORD_SUFFIX" desc="Suffix for spoken keyword suggestion description to explain keystroke used to search.">
+  <message name="IDS_ACC_KEYWORD_SUFFIX" desc="Suffix for spoken keyword suggestion description to explain keystroke used to search.">
     <ph name="KEYWORD_FOCUSED_FRIENDLY_MATCH_TEXT">$1<ex>The Chromium Projects http://www.chromium.org bookmark</ex></ph>, press Tab then Enter to search
   </message>
   <message name="IDS_ACC_KEYWORD_MODE" desc="Announcement when entering keyword search mode.">
@@ -259,6 +259,9 @@
   </message>
 
   <!-- Accessibility suffix for suggestions when the remove button is focused. -->
+  <message name="IDS_ACC_REMOVE_SUGGESTION_SUFFIX" desc="Suffix for suggestions with remove suggestion button to explain keystroke used to remove suggestion.">
+    <ph name="REMOVE_SUGGESTION_SUFFIX">$1<ex>The Chromium Projects http://www.chromium.org bookmark</ex></ph>, press Tab then Enter to Remove Suggestion.
+  </message>
   <message name="IDS_ACC_REMOVE_SUGGESTION_FOCUSED_PREFIX" desc="Announcement when remove suggestion button is focused.">
     Remove Suggestion button, press Enter to remove, <ph name="REMOVE_BUTTON_FOCUSED_FRIENDLY_MATCH_TEXT">$1<ex>The Chromium Projects http://www.chromium.org bookmark</ex></ph>
   </message>

components/omnibox_strings_grdp/IDS_ACC_REMOVE_SUGGESTION_SUFFIX.png.sha1

+a05ef99c963e4207852804ed29b9cb314e29d1fa
\ No newline at end of file