[OriginChip] Add options for the position of the origin chip.

chrome/browser/about_flags.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/about_flags.h"
 
 #include <algorithm>
 #include <iterator>
 #include <map>
 #include <set>
@@ skipping 333 matching lines @@
   { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
     switches::kDisableSearchButtonInOmnibox, ""},
   { IDS_FLAGS_SEARCH_BUTTON_IN_OMNIBOX_ENABLE_FOR_STR,
     switches::kEnableSearchButtonInOmniboxForStr, ""},
   { IDS_FLAGS_SEARCH_BUTTON_IN_OMNIBOX_ENABLE_FOR_STR_OR_IIP,
     switches::kEnableSearchButtonInOmniboxForStrOrIip, ""},
   { IDS_FLAGS_SEARCH_BUTTON_IN_OMNIBOX_ENABLED,
     switches::kEnableSearchButtonInOmniboxAlways, ""}
 };
 
+// See comment above for kSearchButtonInOmniboxChoices. The same reasoning
+// applies here.
+const Experiment::Choice kOriginChipChoices[] = {
+  { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
+  { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, switches::kDisableOriginChip, ""},
+  { IDS_FLAGS_ORIGIN_CHIP_LEFT_OF_LOCATION_BAR,
+    switches::kEnableOriginChipLeftOfLocationBar, ""},
+  { IDS_FLAGS_ORIGIN_CHIP_RIGHT_OF_LOCATION_BAR,
+    switches::kEnableOriginChipRightOfLocationBar, ""},
+  { IDS_FLAGS_ORIGIN_CHIP_LEFT_OF_MENU,
+    switches::kEnableOriginChipLeftOfMenu, ""}
+};
+
 // RECORDING USER METRICS FOR FLAGS:
 // -----------------------------------------------------------------------------
 // The first line of the experiment is the internal name. If you'd like to
 // gather statistics about the usage of your flag, you should append a marker
 // comment to the end of the feature name, like so:
 //   "my-special-feature",  // FLAGS:RECORD_UMA
 //
 // After doing that, run //tools/metrics/actions/extract_actions.py (see
 // instructions at the top of that file for details) to update the
 // chromeactions.txt file, which will enable UMA to record your feature flag.
@@ skipping 1561 matching lines @@
     IDS_FLAGS_NUM_RASTER_THREADS_NAME,
     IDS_FLAGS_NUM_RASTER_THREADS_DESCRIPTION,
     kOsAll,
     MULTI_VALUE_TYPE(kNumRasterThreadsChoices)
   },
   {
     "origin-chip",
     IDS_FLAGS_ORIGIN_CHIP_NAME,
     IDS_FLAGS_ORIGIN_CHIP_DESCRIPTION,
     kOsCrOS | kOsWin,
-    ENABLE_DISABLE_VALUE_TYPE(switches::kEnableOriginChip,
-                              switches::kDisableOriginChip)
+    MULTI_VALUE_TYPE(kOriginChipChoices)
   },
   {
     "search-button-in-omnibox",
     IDS_FLAGS_SEARCH_BUTTON_IN_OMNIBOX_NAME,
     IDS_FLAGS_SEARCH_BUTTON_IN_OMNIBOX_DESCRIPTION,
     kOsCrOS | kOsMac | kOsWin,
     MULTI_VALUE_TYPE(kSearchButtonInOmniboxChoices)
   },
   {
     "enable-ignore-autocomplete-off",
@@ skipping 515 matching lines @@
 }
 
 const Experiment* GetExperiments(size_t* count) {
   *count = num_experiments;
   return experiments;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags