| Index: chrome/browser/about_flags.cc
|
| diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
| index d7725b1045b268a4ccdbf2362a0e6fe01724e3ba..abb2c067cc993ccbe00551394a04f50d658c5f26 100644
|
| --- a/chrome/browser/about_flags.cc
|
| +++ b/chrome/browser/about_flags.cc
|
| @@ -134,14 +134,14 @@ namespace {
|
| const unsigned kOsAll = kOsMac | kOsWin | kOsLinux | kOsCrOS | kOsAndroid;
|
| const unsigned kOsDesktop = kOsMac | kOsWin | kOsLinux | kOsCrOS;
|
|
|
| -const FeatureEntry::Choice kTouchEventsChoices[] = {
|
| +const FeatureEntry::Choice kTouchEventFeatureDetectionChoices[] = {
|
| { IDS_GENERIC_EXPERIMENT_CHOICE_AUTOMATIC, "", "" },
|
| { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
|
| - switches::kTouchEvents,
|
| - switches::kTouchEventsEnabled },
|
| + switches::kTouchEventFeatureDetection,
|
| + switches::kTouchEventFeatureDetectionEnabled },
|
| { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
|
| - switches::kTouchEvents,
|
| - switches::kTouchEventsDisabled }
|
| + switches::kTouchEventFeatureDetection,
|
| + switches::kTouchEventFeatureDetectionDisabled }
|
| };
|
|
|
| #if defined(USE_AURA)
|
| @@ -865,7 +865,7 @@ const FeatureEntry kFeatureEntries[] = {
|
| SINGLE_VALUE_TYPE(switches::kExtendMdToSecondaryUi)},
|
| {"touch-events", IDS_FLAGS_TOUCH_EVENTS_NAME,
|
| IDS_FLAGS_TOUCH_EVENTS_DESCRIPTION, kOsDesktop,
|
| - MULTI_VALUE_TYPE(kTouchEventsChoices)},
|
| + MULTI_VALUE_TYPE(kTouchEventFeatureDetectionChoices)},
|
| {"disable-touch-adjustment", IDS_FLAGS_TOUCH_ADJUSTMENT_NAME,
|
| IDS_FLAGS_TOUCH_ADJUSTMENT_DESCRIPTION,
|
| kOsWin | kOsLinux | kOsCrOS | kOsAndroid,
|
| @@ -1989,8 +1989,7 @@ const FeatureEntry kFeatureEntries[] = {
|
| FEATURE_VALUE_TYPE(media::kNewAudioRenderingMixingStrategy)},
|
| {"disable-background-video-track",
|
| IDS_BACKGROUND_VIDEO_TRACK_OPTIMIZATION_NAME,
|
| - IDS_BACKGROUND_VIDEO_TRACK_OPTIMIZATION_DESCRIPTION,
|
| - kOsAll,
|
| + IDS_BACKGROUND_VIDEO_TRACK_OPTIMIZATION_DESCRIPTION, kOsAll,
|
| FEATURE_VALUE_TYPE(media::kBackgroundVideoTrackOptimization)},
|
| #if defined(OS_CHROMEOS)
|
| {"files-quick-view", IDS_FLAGS_FILES_QUICK_VIEW_NAME,
|
| @@ -2087,8 +2086,7 @@ const FeatureEntry kFeatureEntries[] = {
|
| IDS_FLAGS_OFFLINE_PAGES_SVELTE_CONCURRENT_LOADING_DESCRIPTION, kOsAndroid,
|
| FEATURE_VALUE_TYPE(
|
| offline_pages::kOfflinePagesSvelteConcurrentLoadingFeature)},
|
| - {"web-payments-modifiers",
|
| - IDS_FLAGS_WEB_PAYMENTS_MODIFIERS_NAME,
|
| + {"web-payments-modifiers", IDS_FLAGS_WEB_PAYMENTS_MODIFIERS_NAME,
|
| IDS_FLAGS_WEB_PAYMENTS_MODIFIERS_DESCRIPTION, kOsAndroid,
|
| FEATURE_VALUE_TYPE(chrome::android::kWebPaymentsModifiers)},
|
| #endif
|
|
|