[omnibox] Add accessibility text for rich entity suggestions

Rich entity search suggestions with description will use a
new accessibility label format including the entity name,
followed by the description, followed by "search suggestion".
Entities without a description will fall back to the simple
search suggestion format as before.

Bug: 853252
Change-Id: I978ceafc07971704d7fcf0ad3d2e27e5f3ec7763
Reviewed-on: https://chromium-review.googlesource.com/1123158Reviewed-by: Aaron Leventhal <aleventhal@chromium.org>
Reviewed-by: Justin Donnelly <jdonnelly@chromium.org>
Reviewed-by: Mark Pearson <mpearson@chromium.org>
Commit-Queue: Orin Jaworski <orinj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#572342}

components/omnibox/browser/autocomplete_match_type.cc

@@ -72,13 +72,13 @@ base::string16 AutocompleteMatchType::ToAccessibilityLabel(
 
       // HISTORY_KEYWORD is a custom search engine with no %s in its string - so
       // more or less a regular URL.
-      0,                                      // HISTORY_KEYWORD
-      0,                                      // NAVSUGGEST
-      IDS_ACC_AUTOCOMPLETE_SEARCH,            // SEARCH_WHAT_YOU_TYPED
-      IDS_ACC_AUTOCOMPLETE_SEARCH_HISTORY,    // SEARCH_HISTORY
-      IDS_ACC_AUTOCOMPLETE_SUGGESTED_SEARCH,  // SEARCH_SUGGEST
-      IDS_ACC_AUTOCOMPLETE_SUGGESTED_SEARCH,  // SEARCH_SUGGEST_ENTITY
-      IDS_ACC_AUTOCOMPLETE_SUGGESTED_SEARCH,  // SEARCH_SUGGEST_TAIL
+      0,                                             // HISTORY_KEYWORD
+      0,                                             // NAVSUGGEST
+      IDS_ACC_AUTOCOMPLETE_SEARCH,                   // SEARCH_WHAT_YOU_TYPED
+      IDS_ACC_AUTOCOMPLETE_SEARCH_HISTORY,           // SEARCH_HISTORY
+      IDS_ACC_AUTOCOMPLETE_SUGGESTED_SEARCH,         // SEARCH_SUGGEST
+      IDS_ACC_AUTOCOMPLETE_SUGGESTED_SEARCH_ENTITY,  // SEARCH_SUGGEST_ENTITY
+      IDS_ACC_AUTOCOMPLETE_SUGGESTED_SEARCH,         // SEARCH_SUGGEST_TAIL
 
       // SEARCH_SUGGEST_PERSONALIZED are searches from history elsewhere, maybe
       // on other machines via Sync, or when signed in to Google.
@@ -126,7 +126,16 @@ base::string16 AutocompleteMatchType::ToAccessibilityLabel(
         message = IDS_ACC_AUTOCOMPLETE_QUICK_ANSWER;
       }
       break;
-
+    case IDS_ACC_AUTOCOMPLETE_SUGGESTED_SEARCH_ENTITY:
+      if (match.description.empty()) {
+        // No description, so fall back to ordinary search suggestion format.
+        message = IDS_ACC_AUTOCOMPLETE_SUGGESTED_SEARCH;
+      } else {
+        // Full entity search suggestion with description.
+        description = match.description;
+        has_description = true;
+      }
+      break;
     case IDS_ACC_AUTOCOMPLETE_HISTORY:
     case IDS_ACC_AUTOCOMPLETE_BOOKMARK:
     case IDS_ACC_AUTOCOMPLETE_CLIPBOARD:

components/omnibox_strings.grdp

@@ -71,6 +71,9 @@
   <message name="IDS_ACC_AUTOCOMPLETE_SUGGESTED_SEARCH" desc="Text for screenreaders describing a suggested search.">
     <ph name="TEXT">$1<ex>dogs</ex> search suggestion</ph>
   </message>
+  <message name="IDS_ACC_AUTOCOMPLETE_SUGGESTED_SEARCH_ENTITY" desc="Readable text represening a search suggestion for a rich entity with type description.  The commas are significant as they will introduce a pause in the spoken text.">
+    <ph name="ENTITY">$1<ex>muhammad ali</ex></ph>, <ph name="DESCRIPTION">$2<ex>american professional boxer</ex></ph>, search suggestion
+  </message>
   <message name="IDS_ACC_AUTOCOMPLETE_QUICK_ANSWER" desc="Readable text represening a query typed by the user in the omnibox, followed by an indication that an answer to that query will follow, followed by the answer. The commas are significant as they will introduce a pause in the spoken text.">
     <ph name="QUERY">$1<ex>weather in los angeles</ex></ph>, answer, <ph name="ANSWER">$2<ex>sunny and 84 degrees</ex></ph>
   </message>