[OriginChip] Add an option to display only on search result pages.

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 348 matching lines @@
     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, ""}
+    switches::kEnableOriginChipV2HideOnUserInput, ""},

[Peter Kasting, 2014/05/08 21:32:31]

While I'm here, I notice we still have both options above, even though (AFAIK?)
we implemented the hybrid solution already -- can we just remove one of these
and rename the other "Enabled, shown on all pages" or something?  That would
also make it less ambiguous why we have click/focus options for "all pages" but
not for "SRP only" (even though one of those doesn't really make sense for
SRPs).

(Could be done in a separate CL)

[Justin Donnelly, 2014/05/08 22:27:16]

Getting rid of "HideOnUserInput" makes sense since "HideOnMouseRelease" enables
the hybrid solution. But I don't think I can just eliminate an existing option
here without affecting the choice that's been encoded and written down for users
who've already selected an option (correct me if you think I'm wrong).

I'll look into it some more after submitting this.

[Peter Kasting, 2014/05/08 22:39:39]

You mean, you're worried about people who pick "option 3" having the meaning of
"3" change out from under them?

One way to do this is to just rename the flag/pref so everyone gets reset to the
default.  Another way is to write a migration pass and use a separate bool (or
version number) in the prefs to mark whether it's done -- IMO, more effort than
this is worth.

Incidentally, if instead of mixing all these options together as enumerated
choices for one flag, we had separate bools to toggle e.g. "origin chip
enabled", "always show/shown on SRPs", etc., we could more easily add/remove
choices without mucking up existing ones.

Anyway, if you're going to clean this up in the future, please also consider
completely nuking the "origin chip in toolbar" variant (from everywhere in the
codebase).

+  { IDS_FLAGS_ORIGIN_CHIP_V2_ON_SRP,
+    switches::kEnableOriginChipV2OnSrp, ""}
 };
 
 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 1987 matching lines @@
 }
 
 const Experiment* GetExperiments(size_t* count) {
   *count = num_experiments;
   return experiments;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags