| Index: chrome/browser/about_flags.cc
|
| diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
| index 991de74a944b4d8de462d7903792e9bd7ec2d522..582b4047005708db1c121a5c0bb4523277dcfdb3 100644
|
| --- a/chrome/browser/about_flags.cc
|
| +++ b/chrome/browser/about_flags.cc
|
| @@ -334,19 +334,6 @@ const Experiment::Choice kOriginChipChoices[] = {
|
| { IDS_FLAGS_ORIGIN_CHIP_ON_SRP, switches::kEnableOriginChipOnSrp, ""}
|
| };
|
|
|
| -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 },
|
| - { IDS_FLAGS_TOUCH_SCROLLING_MODE_SYNC_TOUCHMOVE,
|
| - switches::kTouchScrollingMode,
|
| - switches::kTouchScrollingModeSyncTouchmove },
|
| -};
|
| -
|
| const Experiment::Choice kExtensionContentVerificationChoices[] = {
|
| { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
|
| { IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_BOOTSTRAP,
|
| @@ -1774,13 +1761,6 @@ const Experiment kExperiments[] = {
|
| },
|
| #endif
|
| {
|
| - "touch-scrolling-mode",
|
| - IDS_FLAGS_TOUCH_SCROLLING_MODE_NAME,
|
| - IDS_FLAGS_TOUCH_SCROLLING_MODE_DESCRIPTION,
|
| - kOsWin | kOsLinux | kOsCrOS | kOsAndroid,
|
| - MULTI_VALUE_TYPE(kTouchScrollingModeChoices)
|
| - },
|
| - {
|
| "disable-threaded-scrolling",
|
| IDS_FLAGS_DISABLE_THREADED_SCROLLING_NAME,
|
| IDS_FLAGS_DISABLE_THREADED_SCROLLING_DESCRIPTION,
|
|
|