[omnibox] Hide keyword hint if suggestion button row is enabled

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

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

@@ -576,8 +576,10 @@ void LocationBarView::Layout() {
   }
   // Because IMEs may eat the tab key, we don't show "press tab to search" while
   // IME composition is in progress.
-  if (HasFocus() && !keyword.empty() &&
-      omnibox_view_->model()->is_keyword_hint() &&
+  // The keyword hint is also not shown when the Button Row is enabled since
+  // it's now redundant with the keyword button and is no longer accurate.
+  if (!OmniboxFieldTrial::IsSuggestionButtonRowEnabled() && HasFocus() &&
+      !keyword.empty() && omnibox_view_->model()->is_keyword_hint() &&
       !omnibox_view_->IsImeComposing()) {
     trailing_decorations.AddDecoration(vertical_padding, location_height, true,
                                        0, edge_padding, keyword_hint_view_);