[omnibox] Revert earlier a11y change

The previous a11y change:

https://chromium-review.googlesource.com/c/chromium/src/+/1955161

didn't work well on Windows. I'm just reverting it since I don't
have time to look into a proper fix.

This had minor conflicts, which may cause an issue merging to M81.

Bug: 1045192 1045199
Change-Id: Idbf00425dcfc8a3a516cd60a8c5338c1faea3e74
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2036806Reviewed-by: Orin Jaworski <orinj@chromium.org>
Commit-Queue: Kevin Bailey <krb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#738358}

chrome/browser/ui/views/location_bar/location_bar_view.cc

@@ -508,11 +508,8 @@ void LocationBarView::Layout() {
     leading_decorations.AddDecoration(vertical_padding, location_height, false,
                                       kLeadingDecorationMaxFraction,
                                       edge_padding, selected_keyword_view_);
-    // Call this even if keyword doesn't change. Let the View decide what to do
-    // about a11y.
-    bool keyword_changed = selected_keyword_view_->keyword() != keyword;
-    selected_keyword_view_->SetKeyword(keyword, profile_);
-    if (keyword_changed) {
+    if (selected_keyword_view_->keyword() != keyword) {
+      selected_keyword_view_->SetKeyword(keyword, profile_);
       const TemplateURL* template_url =
           TemplateURLServiceFactory::GetForProfile(profile_)
               ->GetTemplateURLForKeyword(keyword);

chrome/browser/ui/views/location_bar/selected_keyword_view.cc

@@ -86,28 +86,25 @@ void SelectedKeywordView::OnThemeChanged() {
 
 void SelectedKeywordView::SetKeyword(const base::string16& keyword,
                                      Profile* profile) {
-  if (keyword_ != keyword) {
-    keyword_ = keyword;
-    if (keyword.empty())
-      return;
-
-    DCHECK(profile);
-    TemplateURLService* service =
-        TemplateURLServiceFactory::GetForProfile(profile);
-    if (!service)
-      return;
-
-    KeywordLabelNames names = GetKeywordLabelNames(keyword, service);
-    full_label_.SetText(names.full_name);
-    partial_label_.SetText(names.short_name);
-
-    // Update the label now so ShouldShowLabel() works correctly when the parent
-    // class is calculating the preferred size. It will be updated again in
-    // Layout(), taking into account how much space has actually been allotted.
-    SetLabelForCurrentWidth();
-  }
-  if (!keyword_.empty())
-    NotifyAccessibilityEvent(ax::mojom::Event::kLiveRegionChanged, true);
+  keyword_ = keyword;
+  if (keyword.empty())
+    return;
+
+  DCHECK(profile);
+  TemplateURLService* service =
+      TemplateURLServiceFactory::GetForProfile(profile);
+  if (!service)
+    return;
+
+  KeywordLabelNames names = GetKeywordLabelNames(keyword, service);
+  full_label_.SetText(names.full_name);
+  partial_label_.SetText(names.short_name);
+
+  // Update the label now so ShouldShowLabel() works correctly when the parent
+  // class is calculating the preferred size. It will be updated again in
+  // Layout(), taking into account how much space has actually been allotted.
+  SetLabelForCurrentWidth();
+  NotifyAccessibilityEvent(ax::mojom::Event::kLiveRegionChanged, true);
 }
 
 int SelectedKeywordView::GetExtraInternalSpacing() const {

chrome/browser/ui/views/omnibox/omnibox_view_views.cc

@@ -888,10 +888,6 @@ void OmniboxViewViews::SetAccessibilityLabel(const base::string16& display_text,
 #endif
 }
 
-void OmniboxViewViews::AnnounceText(const base::string16& message) {
-  GetViewAccessibility().AnnounceText(message);
-}
-
 void OmniboxViewViews::SelectAllForUserGesture() {
   if (base::FeatureList::IsEnabled(omnibox::kOneClickUnelide) &&
       UnapplySteadyStateElisions(UnelisionGesture::OTHER)) {

chrome/browser/ui/views/omnibox/omnibox_view_views.h

@@ -194,8 +194,6 @@ class OmniboxViewViews : public OmniboxView,
   void SetAccessibilityLabel(const base::string16& display_text,
                              const AutocompleteMatch& match) override;
 
-  void AnnounceText(const base::string16& message) override;
-
   // Selects the whole omnibox contents as a result of the user gesture. This
   // may also unapply steady state elisions depending on user preferences.
   void SelectAllForUserGesture();

components/omnibox/browser/omnibox_edit_model.cc

@@ -43,9 +43,7 @@
 #include "components/search_engines/template_url.h"
 #include "components/search_engines/template_url_prepopulate_data.h"
 #include "components/search_engines/template_url_service.h"
-#include "components/strings/grit/components_strings.h"
 #include "third_party/metrics_proto/omnibox_event.pb.h"
-#include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/image/image.h"
 #include "url/url_util.h"
 
@@ -1080,7 +1078,6 @@ void OmniboxEditModel::ClearKeyword() {
 
     view_->OnAfterPossibleChange(false);
   }
-  view_->AnnounceText(l10n_util::GetStringUTF16(IDS_ACC_EXIT_SEARCH_MODE));
 }
 
 void OmniboxEditModel::OnSetFocus(bool control_down) {

components/omnibox/browser/omnibox_view.h

@@ -156,9 +156,6 @@ class OmniboxView {
   virtual void SetAccessibilityLabel(const base::string16& display_text,
                                      const AutocompleteMatch& match) {}
 
-  // Triggers announcement of immediate |message|.
-  virtual void AnnounceText(const base::string16& message) {}
-
   // Called when the temporary text in the model may have changed.
   // |display_text| is the new text to show; |match_type| is the type of the
   // match the new text came from. |save_original_selection| is true when there

components/omnibox_strings.grdp

@@ -238,7 +238,4 @@
   <message name="IDS_ACC_REMOVE_SUGGESTION_BUTTON" desc="Announcement when remove suggestion button is focused.">
     Remove Suggestion button, press Enter to remove this suggestion
   </message>
-  <message name="IDS_ACC_EXIT_SEARCH_MODE" desc="Announcement when Omnibox exits keyword search mode.">
-    Exiting search mode
-  </message>
 </grit-part>