[omnibox] Disabled keyword mode by space if suggeston button row is enabled

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

components/omnibox/browser/omnibox_edit_model.cc

@@ -1436,7 +1436,10 @@ bool OmniboxEditModel::OnAfterPossibleChange(
   // |allow_exact_keyword_match_| will be used by StartAutocomplete() method,
   // which will be called by |view_->UpdatePopup()|; so after that returns we
   // can safely reset this flag.
+  // Entering keyword mode by space is disabled if suggestion button row is
+  // enabled, so do not set |allow_exact_keyword_match_| if button row enabled.
   allow_exact_keyword_match_ =
+      !OmniboxFieldTrial::IsSuggestionButtonRowEnabled() &&
       state_changes.text_differs && allow_keyword_ui_change &&
       !state_changes.just_deleted_text && no_selection &&
       CreatedKeywordSearchByInsertingSpaceInMiddle(
@@ -1621,6 +1624,12 @@ bool OmniboxEditModel::ShouldPreventElision() const {
 bool OmniboxEditModel::MaybeAcceptKeywordBySpace(
     const base::string16& new_text) {
   size_t keyword_length = new_text.length() - 1;
+
+  // Entering keyword mode by space is disabled when Suggestion Button Row is
+  // enabled, so do not accept keyword.
+  if (OmniboxFieldTrial::IsSuggestionButtonRowEnabled())
+    return false;
+
   return is_keyword_hint_ && (keyword_.length() == keyword_length) &&
          IsSpaceCharForAcceptingKeyword(new_text[keyword_length]) &&
          !new_text.compare(0, keyword_length, keyword_, 0, keyword_length) &&