| Index: chrome/browser/about_flags.cc
|
| diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
| index fa498080f9561ff2218414b3dfb0215a7ee6b0ef..4a6ffcc8dd531f8515e175c02d881a3e4a76180c 100644
|
| --- a/chrome/browser/about_flags.cc
|
| +++ b/chrome/browser/about_flags.cc
|
| @@ -268,18 +268,6 @@ const Experiment::Choice kTabCaptureDownscaleQualityChoices[] = {
|
| };
|
| #endif
|
|
|
| -#if defined(TOOLKIT_VIEWS)
|
| -const Experiment::Choice kTabCloseButtonsHiddenWithTouchChoices[] = {
|
| - { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
|
| - { IDS_FLAGS_TAB_CLOSE_BUTTONS_HIDDEN_WITH_TOUCH_ALWAYS,
|
| - switches::kTabCloseButtonsHiddenWithTouch, "always" },
|
| - { IDS_FLAGS_TAB_CLOSE_BUTTONS_HIDDEN_WITH_TOUCH_NARROW,
|
| - switches::kTabCloseButtonsHiddenWithTouch, "narrow" },
|
| - { IDS_FLAGS_TAB_CLOSE_BUTTONS_HIDDEN_WITH_TOUCH_STACKED,
|
| - switches::kTabCloseButtonsHiddenWithTouch, "stacked" },
|
| -};
|
| -#endif
|
| -
|
| #if defined(OS_ANDROID)
|
| const Experiment::Choice kZeroSuggestExperimentsChoices[] = {
|
| { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
|
| @@ -1393,11 +1381,11 @@ const Experiment kExperiments[] = {
|
| #endif
|
| #if defined(TOOLKIT_VIEWS)
|
| {
|
| - "tab-close-buttons-hidden-with-touch",
|
| - IDS_FLAGS_TAB_CLOSE_BUTTONS_HIDDEN_WITH_TOUCH_NAME,
|
| - IDS_FLAGS_TAB_CLOSE_BUTTONS_HIDDEN_WITH_TOUCH_DESCRIPTION,
|
| + "disable-hide-inactive-stacked-tab-close-buttons",
|
| + IDS_FLAGS_DISABLE_HIDE_INACTIVE_STACKED_TAB_CLOSE_BUTTONS_NAME,
|
| + IDS_FLAGS_DISABLE_HIDE_INACTIVE_STACKED_TAB_CLOSE_BUTTONS_DESCRIPTION,
|
| kOsCrOS | kOsWin | kOsLinux,
|
| - MULTI_VALUE_TYPE(kTabCloseButtonsHiddenWithTouchChoices)
|
| + SINGLE_VALUE_TYPE(switches::kDisableHideInactiveStackedTabCloseButtons)
|
| },
|
| #endif
|
| {
|
|
|