[omnibox] Add official flag for experimental keyword mode

Simply adds a flag for the existing feature.

Bug: 883901
Change-Id: I13076b469f55f14ef0cc52f573fc2648736c6684
Reviewed-on: https://chromium-review.googlesource.com/c/1440183
Reviewed-by: Avi Drissman <[email protected]>
Reviewed-by: manuk hovanesian <[email protected]>
Commit-Queue: Kevin Bailey <[email protected]>
Cr-Commit-Position: refs/heads/master@{#628126}
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 610017f..4a08cbc9 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -2976,6 +2976,10 @@
 #endif  // defined(OS_ANDROID)
 
 #if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
+    {"omnibox-experimental-keyword-mode",
+     flag_descriptions::kOmniboxExperimentalKeywordModeName,
+     flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop,
+     FEATURE_VALUE_TYPE(omnibox::kExperimentalKeywordMode)},
     {"omnibox-reverse-answers", flag_descriptions::kOmniboxReverseAnswersName,
      flag_descriptions::kOmniboxReverseAnswersDescription, kOsDesktop,
      FEATURE_VALUE_TYPE(omnibox::kOmniboxReverseAnswers)},
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
index d624898..d841589 100644
--- a/chrome/browser/flag-metadata.json
+++ b/chrome/browser/flag-metadata.json
@@ -1729,7 +1729,7 @@
   },
   {
     "name": "enable-query-in-omnibox",
-    // "owners": [ "your-team" ],
+    "owners": [ "tommycli", "chrome-omnibox-team" ],
     "expiry_milestone": 76
   },
   {
@@ -2713,77 +2713,82 @@
   },
   {
     "name": "omnibox-display-title-for-current-url",
-    // "owners": [ "your-team" ],
+    "owners": [ "chrome-omnibox-team" ],
     "expiry_milestone": 76
   },
   {
     "name": "omnibox-drive-suggestions",
-    // "owners": [ "your-team" ],
+    "owners": [ "skare", "chrome-omnibox-team" ],
+    "expiry_milestone": 76
+  },
+  {
+    "name": "omnibox-experimental-keyword-mode",
+    "owners": [ "krb", "chrome-omnibox-team" ],
     "expiry_milestone": 76
   },
   {
     "name": "omnibox-new-answer-layout",
-    // "owners": [ "your-team" ],
+    "owners": [ "chrome-omnibox-team" ],
     "expiry_milestone": 76
   },
   {
     "name": "omnibox-pedal-suggestions",
-    // "owners": [ "your-team" ],
+    "owners": [ "orinj", "chrome-omnibox-team" ],
     "expiry_milestone": 76
   },
   {
     "name": "omnibox-reverse-answers",
-    // "owners": [ "your-team" ],
+    "owners": [ "chrome-omnibox-team" ],
     "expiry_milestone": 76
   },
   {
     "name": "omnibox-rich-entity-suggestions",
-    // "owners": [ "your-team" ],
+    "owners": [ "chrome-omnibox-team" ],
     "expiry_milestone": 76
   },
   {
     "name": "omnibox-spare-renderer",
-    // "owners": [ "your-team" ],
+    "owners": [ "chrome-omnibox-team" ],
     "expiry_milestone": 76
   },
   {
     "name": "omnibox-tab-switch-suggestions",
-    // "owners": [ "your-team" ],
+    "owners": [ "krb", "chrome-omnibox-team" ],
     "expiry_milestone": 76
   },
   {
     "name": "omnibox-tail-suggestions",
-    // "owners": [ "your-team" ],
+    "owners": [ "krb", "chrome-omnibox-team" ],
     "expiry_milestone": 76
   },
   {
     "name": "omnibox-ui-hide-steady-state-url-path-query-and-ref",
-    // "owners": [ "your-team" ],
+    "owners": [ "chrome-omnibox-team" ],
     "expiry_milestone": 76
   },
   {
     "name": "omnibox-ui-hide-steady-state-url-scheme",
-    // "owners": [ "your-team" ],
+    "owners": [ "chrome-omnibox-team" ],
     "expiry_milestone": 76
   },
   {
     "name": "omnibox-ui-hide-steady-state-url-trivial-subdomains",
-    // "owners": [ "your-team" ],
+    "owners": [ "chrome-omnibox-team" ],
     "expiry_milestone": 76
   },
   {
     "name": "omnibox-ui-max-autocomplete-matches",
-    // "owners": [ "your-team" ],
+    "owners": [ "chrome-omnibox-team" ],
     "expiry_milestone": 76
   },
   {
     "name": "omnibox-ui-one-click-unelide",
-    "owners": [ "tommycli" ],
+    "owners": [ "tommycli", "chrome-omnibox-team" ],
     "expiry_milestone": 76
   },
   {
     "name": "omnibox-ui-swap-title-and-url",
-    // "owners": [ "your-team" ],
+    "owners": [ "chrome-omnibox-team" ],
     "expiry_milestone": 76
   },
   {
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
index b57c0ec..8a8b7f5f 100644
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -2836,6 +2836,12 @@
     "Display suggestions for Google Drive documents in the omnibox when Google "
     "is the default search engine.";
 
+const char kOmniboxExperimentalKeywordModeName[] =
+    "Omnibox Experimental Keyword Mode";
+const char kOmniboxExperimentalKeywordModeDescription[] =
+    "Enables various experimental features related to keyword mode, its "
+    "suggestions and layout";
+
 const char kOmniboxPedalSuggestionsName[] = "Omnibox Pedal suggestions";
 const char kOmniboxPedalSuggestionsDescription[] =
     "Enable omnibox Pedal suggestions using either a side button in suggestion "
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
index d21bc7b..f6f2995 100644
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -1681,6 +1681,9 @@
 extern const char kOmniboxDriveSuggestionsName[];
 extern const char kOmniboxDriveSuggestionsDescriptions[];
 
+extern const char kOmniboxExperimentalKeywordModeName[];
+extern const char kOmniboxExperimentalKeywordModeDescription[];
+
 extern const char kOmniboxPedalSuggestionsName[];
 extern const char kOmniboxPedalSuggestionsDescription[];