Remove origin chip v1 and "hide on input" v2 behavior.

chrome/app/generated_resources.grd

Index: chrome/app/generated_resources.grd
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 5367ae6b958dcb2beabf7cce30269e55383e8f04..78332e2d7357d4f24cfaa6730567801ea98439a3 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -6388,35 +6388,17 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_FLAGS_ENABLE_ENHANCED_BOOKMARKS_DESCRIPTION" desc="Description of about:flags option to enable Enhanced Bookmarks extension.">
         Provides an off switch for enhanced bookmarks experiment
       </message>
-      <message name="IDS_FLAGS_ORIGIN_CHIP_NAME" desc="Name of about:flags option to enable the display of the Origin Chip experiment.">
-        Enable origin chip
+      <message name="IDS_FLAGS_ORIGIN_CHIP_NAME" desc="Name of about:flags option to enable the display of the origin chip experiment.">
+        Origin chip
       </message>
-      <message name="IDS_FLAGS_ORIGIN_CHIP_DESCRIPTION" desc="Description of about:flags option to enable the display of the Origin Chip experiment.">
-        Moves the URL out of the Omnibox and shows the hostname in the origin chip in the toolbar.
+      <message name="IDS_FLAGS_ORIGIN_CHIP_DESCRIPTION" desc="Description of about:flags option to enable the display of the origin chip experiment.">
+        Hides the URL in the Omnibox and instead shows the hostname in a clickable chip.
       </message>
-      <message name="IDS_FLAGS_ORIGIN_CHIP_LEADING_LOCATION_BAR" desc="Option in a drop-down menu to enable the display of the origin chip leading the location bar.">
-        Enabled and positioned leading the location bar
-      </message>
-      <message name="IDS_FLAGS_ORIGIN_CHIP_TRAILING_LOCATION_BAR" desc="Option in a drop-down menu to enable the display of the origin chip trailing the location bar.">
-        Enabled and positioned trailing the location bar
-      </message>
-      <message name="IDS_FLAGS_ORIGIN_CHIP_LEADING_MENU_BUTTON" desc="Option in a drop-down menu to enable the display of the origin chip leading the app menu button.">
-        Enabled and positioned leading the app menu button
-      </message>
-      <message name="IDS_FLAGS_ORIGIN_CHIP_V2_NAME" desc="Name of about:flags option to enable the display of the origin chip v2 experiment.">
-        Enable origin chip in Omnibox
-      </message>
-      <message name="IDS_FLAGS_ORIGIN_CHIP_V2_DESCRIPTION" desc="Description of about:flags option to enable the display of the origin chip v2 experiment.">
-        Moves the URL out of the Omnibox and shows the hostname in the origin chip in the Omnibox.
-      </message>
-      <message name="IDS_FLAGS_ORIGIN_CHIP_V2_HIDE_ON_MOUSE_RELEASE" desc="Option in a drop-down menu to enable the display of the origin chip v2, with the hides-on-mouse-release behavior.">
-        Enabled; hides on click in the Omnibox
-      </message>
-      <message name="IDS_FLAGS_ORIGIN_CHIP_V2_HIDE_ON_USER_INPUT" desc="Option in a drop-down menu to enable the display of the origin chip v2, with the hides-on-input behavior.">
-        Enabled; hides on input in the Omnibox
+      <message name="IDS_FLAGS_ORIGIN_CHIP_ALWAYS" desc="Option in a drop-down menu to enable the display of the origin chip on all pages.">
+        Enabled on all pages
       </message>
-      <message name="IDS_FLAGS_ORIGIN_CHIP_V2_ON_SRP" desc="Option in a drop-down menu to enable the display of the origin chip v2, with the shown-only-on-srp behavior.">
-        Enabled; shown only on search result pages
+      <message name="IDS_FLAGS_ORIGIN_CHIP_ON_SRP" desc="Option in a drop-down menu to enable the display of the origin chip on search result pages only.">
+        Enabled on search result pages only
       </message>
       <message name="IDS_FLAGS_SEARCH_BUTTON_IN_OMNIBOX_NAME" desc="Name of about:flags option to enable the search button in omnibox experiment.">
         Enable search button in Omnibox