[Omnibox] Move Remove suggestion button to end of row

This CL moves the Remove Suggestion Button to be after the
suggestion button row when navigating via Tab

Bug: 1111205
Change-Id: I7abe2ebf8e03e83b4a593551134d05caba4cdf6c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2328296Reviewed-by: Justin Donnelly <jdonnelly@chromium.org>
Commit-Queue: Angela Yoeurng <yoangela@chromium.org>
Cr-Commit-Position: refs/heads/master@{#793385}

components/omnibox/browser/omnibox_popup_model.cc

@@ -349,10 +349,10 @@ OmniboxPopupModel::GetAllAvailableSelectionsSorted(Direction direction,
     if (OmniboxFieldTrial::IsSuggestionButtonRowEnabled()) {
       // The button row experiment makes things simple. We no longer access
       // keyword mode tab button in this case.
-      all_states.push_back(FOCUSED_BUTTON_REMOVE_SUGGESTION);
       all_states.push_back(FOCUSED_BUTTON_KEYWORD);
       all_states.push_back(FOCUSED_BUTTON_TAB_SWITCH);
       all_states.push_back(FOCUSED_BUTTON_PEDAL);
+      all_states.push_back(FOCUSED_BUTTON_REMOVE_SUGGESTION);
     } else {
       // Keyword mode is only accessible by Tabbing forward.
       if (direction == kForward) {
@@ -360,8 +360,8 @@ OmniboxPopupModel::GetAllAvailableSelectionsSorted(Direction direction,
           all_states.push_back(KEYWORD);
         }
       }
-      all_states.push_back(FOCUSED_BUTTON_REMOVE_SUGGESTION);
       all_states.push_back(FOCUSED_BUTTON_TAB_SWITCH);
+      all_states.push_back(FOCUSED_BUTTON_REMOVE_SUGGESTION);
     }
   }
   DCHECK(std::is_sorted(all_states.begin(), all_states.end()))
@@ -498,15 +498,6 @@ bool OmniboxPopupModel::IsControlPresentOnMatch(Selection selection) const {
       return true;
     case KEYWORD:
       return match.associated_keyword != nullptr;
-    case FOCUSED_BUTTON_REMOVE_SUGGESTION:
-      // Remove suggestion buttons are suppressed for matches with an associated
-      // keyword or tab match, unless dedicated button row is enabled.
-      if (OmniboxFieldTrial::IsSuggestionButtonRowEnabled())
-        return match.SupportsDeletion();
-      else
-        return !match.associated_keyword &&
-               !match.ShouldShowTabMatchButtonInlineInResultView() &&
-               match.SupportsDeletion();
     case FOCUSED_BUTTON_KEYWORD:
       return match.associated_keyword != nullptr;
     case FOCUSED_BUTTON_TAB_SWITCH:
@@ -518,6 +509,15 @@ bool OmniboxPopupModel::IsControlPresentOnMatch(Selection selection) const {
         return match.ShouldShowTabMatchButtonInlineInResultView();
     case FOCUSED_BUTTON_PEDAL:
       return match.pedal != nullptr;
+    case FOCUSED_BUTTON_REMOVE_SUGGESTION:
+      // Remove suggestion buttons are suppressed for matches with an associated
+      // keyword or tab match, unless dedicated button row is enabled.
+      if (OmniboxFieldTrial::IsSuggestionButtonRowEnabled())
+        return match.SupportsDeletion();
+      else
+        return !match.associated_keyword &&
+               !match.ShouldShowTabMatchButtonInlineInResultView() &&
+               match.SupportsDeletion();
     default:
       break;
   }
@@ -612,9 +612,6 @@ base::string16 OmniboxPopupModel::GetAccessibilityLabelForCurrentSelection(
       // TODO(tommycli): Investigate whether the accessibility messaging for
       // Keyword mode belongs here.
       break;
-    case FOCUSED_BUTTON_REMOVE_SUGGESTION:
-      additional_message_id = IDS_ACC_REMOVE_SUGGESTION_FOCUSED_PREFIX;
-      break;
     case FOCUSED_BUTTON_KEYWORD:
       // TODO(yoangela): Add an accessibility message for the Keyword button
       // in the button-row UI configuration.
@@ -626,6 +623,9 @@ base::string16 OmniboxPopupModel::GetAccessibilityLabelForCurrentSelection(
       // TODO(orinj): Add an accessibility message for the Pedal button
       // in the button-row UI configuration.
       break;
+    case FOCUSED_BUTTON_REMOVE_SUGGESTION:
+      additional_message_id = IDS_ACC_REMOVE_SUGGESTION_FOCUSED_PREFIX;
+      break;
     default:
       break;
   }

components/omnibox/browser/omnibox_popup_model.h

@@ -65,23 +65,22 @@ class OmniboxPopupModel {
     // FOCUSED_BUTTON_KEYWORD state, which is only for button focus.
     KEYWORD = 2,
 
-    // FOCUSED_BUTTON_REMOVE_SUGGESTION state means the Remove Suggestion (X)
-    // button is focused. Pressing enter will attempt to remove this suggestion.
-    FOCUSED_BUTTON_REMOVE_SUGGESTION = 3,
-
     // FOCUSED_BUTTON_KEYWORD is used when the keyword button is in focus, not
     // actually in Keyword Mode. This is currently only used if deciated button
     // row is enabled
-    FOCUSED_BUTTON_KEYWORD = 4,
+    FOCUSED_BUTTON_KEYWORD = 3,
 
     // FOCUSED_BUTTON_TAB_SWITCH state means the Switch Tab button is focused.
     // Pressing enter will switch to the tab match.
-    FOCUSED_BUTTON_TAB_SWITCH = 5,
+    FOCUSED_BUTTON_TAB_SWITCH = 4,
 
     // FOCUSED_BUTTON_PEDAL state means a Pedal button is in focus. This is
     // currently only used when dedicated button row and pedals are enabled.
-    FOCUSED_BUTTON_PEDAL = 6,
+    FOCUSED_BUTTON_PEDAL = 5,
 
+    // FOCUSED_BUTTON_REMOVE_SUGGESTION state means the Remove Suggestion (X)
+    // button is focused. Pressing enter will attempt to remove this suggestion.
+    FOCUSED_BUTTON_REMOVE_SUGGESTION = 6,
   };
 
   struct Selection {