| Index: chrome/browser/about_flags.cc
|
| diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
| index 9bedfd3abce82874138d2ed2099a79b3fe2ee630..ee595d09a2074059f4a238b8c9a7bbceeb57f860 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)
|
| @@ -869,7 +869,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,
|
|
|