[omnibox] Add focus rings for button row buttons

This CL adds focus rings that are only used when button row is enabled.

Bug: 1046523
Change-Id: I679cd08c0199eb5de5ac5577a49ef9ce5fdd7b5a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2140309Reviewed-by: Tommy Li <tommycli@chromium.org>
Commit-Queue: Orin Jaworski <orinj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#757204}

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

@@ -118,6 +118,24 @@ OmniboxResultView::OmniboxResultView(
     // TODO(orinj): Use the real translated string table values here instead.
     tab_switch_button_ =
         CreatePillButton(button_row_, this, "Switch to this tab");
+
+    const auto make_predicate = [=](auto state) {
+      return [=](View* view) {
+        return view->GetVisible() &&
+               popup_contents_view_->model()->selection() ==
+                   OmniboxPopupModel::Selection(model_index_, state);
+      };
+    };
+    keyword_button_focus_ring_ = views::FocusRing::Install(keyword_button_);
+    keyword_button_focus_ring_->SetHasFocusPredicate(
+        make_predicate(OmniboxPopupModel::FOCUSED_BUTTON_KEYWORD));
+    pedal_button_focus_ring_ = views::FocusRing::Install(pedal_button_);
+    pedal_button_focus_ring_->SetHasFocusPredicate(
+        make_predicate(OmniboxPopupModel::FOCUSED_BUTTON_PEDAL));
+    tab_switch_button_focus_ring_ =
+        views::FocusRing::Install(tab_switch_button_);
+    tab_switch_button_focus_ring_->SetHasFocusPredicate(
+        make_predicate(OmniboxPopupModel::FOCUSED_BUTTON_TAB_SWITCH));
   }
 
   keyword_view_ = AddChildView(std::make_unique<OmniboxMatchCellView>(this));
@@ -232,6 +250,12 @@ void OmniboxResultView::ApplyThemeAndRefreshIcons(bool force_reapply_styles) {
     keyword_view_->description()->ApplyTextColor(
         OmniboxPart::RESULTS_TEXT_DIMMED);
   }
+
+  if (OmniboxFieldTrial::IsSuggestionButtonRowEnabled()) {
+    keyword_button_focus_ring_->SchedulePaint();
+    pedal_button_focus_ring_->SchedulePaint();
+    tab_switch_button_focus_ring_->SchedulePaint();
+  }
 }
 
 void OmniboxResultView::OnSelectionStateChanged() {

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

@@ -169,6 +169,9 @@ class OmniboxResultView : public views::View,
   views::MdTextButton* keyword_button_ = nullptr;
   views::MdTextButton* pedal_button_ = nullptr;
   views::MdTextButton* tab_switch_button_ = nullptr;
+  std::unique_ptr<views::FocusRing> keyword_button_focus_ring_;
+  std::unique_ptr<views::FocusRing> pedal_button_focus_ring_;
+  std::unique_ptr<views::FocusRing> tab_switch_button_focus_ring_;
 
   // The "X" button at the end of the match cell, used to remove suggestions.
   views::ImageButton* remove_suggestion_button_;