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

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 343 matching lines @@
     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_TRAILING_LOCATION_BAR,
-    switches::kEnableOriginChipTrailingLocationBar, ""},
-  { IDS_FLAGS_ORIGIN_CHIP_LEADING_LOCATION_BAR,
-    switches::kEnableOriginChipLeadingLocationBar, ""},
-  { IDS_FLAGS_ORIGIN_CHIP_LEADING_MENU_BUTTON,
-    switches::kEnableOriginChipLeadingMenuButton, ""}
-};
-const Experiment::Choice kOriginChipV2Choices[] = {
-  { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
-  { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, switches::kDisableOriginChipV2, ""},
-  { IDS_FLAGS_ORIGIN_CHIP_V2_HIDE_ON_MOUSE_RELEASE,
-    switches::kEnableOriginChipV2HideOnMouseRelease, ""},
-  { IDS_FLAGS_ORIGIN_CHIP_V2_HIDE_ON_USER_INPUT,
-    switches::kEnableOriginChipV2HideOnUserInput, ""},
-  { IDS_FLAGS_ORIGIN_CHIP_V2_ON_SRP,
-    switches::kEnableOriginChipV2OnSrp, ""}
+  { IDS_FLAGS_ORIGIN_CHIP, switches::kEnableOriginChip, ""},
+  { IDS_FLAGS_ORIGIN_CHIP_ON_SRP, switches::kEnableOriginChipOnSrp, ""}

[Justin Donnelly, 2014/05/13 22:19:33]

I think dropping the hide-on-input option here could cause a problem.  I'm not
certain, because I wasn't able to figure out what code governs this, but when I
added new options earlier it looked like the position within the
MULTI_VALUE_TYPE array was being encoded in the user profile.

You could test this.  If I'm right, then if you select "hide on input" (4th
position in old array) with an old binary you'll now get "on SRP" (4th position
in new array) running a binary with this change.

Unless that's an acceptable side effect?

[Peter Kasting, 2014/05/14 00:28:11]

I tested copying my profile from my Dev channel build -- which has the v2 origin
chip set to "hide on click" -- over to somewhere I then used for a build of this
CL.  If the position were encoded in the profile, I'd have expected to see the
origin chip flag set to "enabled".  Instead, it was set to "default".

I speculate that toggling the about:flags settings just changes the command-line
flags, and Chrome determines the about:flags UI to show by looking at the
current set of command-line flags.

I think this won't lead to meaningful problems.

[Justin Donnelly, 2014/05/14 16:31:43]

Ok, thanks for checking.

 };
 
 const Experiment::Choice kTouchScrollingModeChoices[] = {
   { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
   { IDS_FLAGS_TOUCH_SCROLLING_MODE_TOUCHCANCEL,
     switches::kTouchScrollingMode,
     switches::kTouchScrollingModeTouchcancel },
   { IDS_FLAGS_TOUCH_SCROLLING_MODE_ASYNC_TOUCHMOVE,
     switches::kTouchScrollingMode,
     switches::kTouchScrollingModeAsyncTouchmove },
@@ skipping 1264 matching lines @@
   },
 #endif
   {
     "num-raster-threads",
     IDS_FLAGS_NUM_RASTER_THREADS_NAME,
     IDS_FLAGS_NUM_RASTER_THREADS_DESCRIPTION,
     kOsAll,
     MULTI_VALUE_TYPE(kNumRasterThreadsChoices)
   },
   {
-    "origin-chip",
+    "origin-chip-in-omnibox",

[Peter Kasting, 2014/05/13 20:30:52]

Alexei, should we change the name of this to something else, since the choice
set is not the same as in the previous "origin-chip-in-omnibox"?  I want to
ensure I don't screw up any stat collection.

[Alexei Svitkine (slow), 2014/05/13 20:49:42]

The name of the flag is actually not used for anything that relates to
experiments. The integration with experiments is with the flag names themselves
(i.e. the kOriginChipChoices values).

If you're changing those (and it looks like you are), you probably want to
update the internal configs that reference them as well. I'll give you a pointer
to that offline.

     IDS_FLAGS_ORIGIN_CHIP_NAME,
     IDS_FLAGS_ORIGIN_CHIP_DESCRIPTION,
-    kOsCrOS | kOsWin | kOsLinux,
+    kOsCrOS | kOsMac | kOsWin | kOsLinux,
     MULTI_VALUE_TYPE(kOriginChipChoices)
   },
   {
-    "origin-chip-in-omnibox",
-    IDS_FLAGS_ORIGIN_CHIP_V2_NAME,
-    IDS_FLAGS_ORIGIN_CHIP_V2_DESCRIPTION,
-    kOsCrOS | kOsMac | kOsWin | kOsLinux,
-    MULTI_VALUE_TYPE(kOriginChipV2Choices)
-  },
-  {
     "search-button-in-omnibox",
     IDS_FLAGS_SEARCH_BUTTON_IN_OMNIBOX_NAME,
     IDS_FLAGS_SEARCH_BUTTON_IN_OMNIBOX_DESCRIPTION,
     kOsCrOS | kOsMac | kOsWin | kOsLinux,
     MULTI_VALUE_TYPE(kSearchButtonInOmniboxChoices)
   },
   {
     "disable-ignore-autocomplete-off",
     IDS_FLAGS_DISABLE_IGNORE_AUTOCOMPLETE_OFF_NAME,
     IDS_FLAGS_DISABLE_IGNORE_AUTOCOMPLETE_OFF_DESCRIPTION,
@@ skipping 706 matching lines @@
 }
 
 const Experiment* GetExperiments(size_t* count) {
   *count = num_experiments;
   return experiments;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags