Index: chrome/browser/about_flags.cc |
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc |
index b8e1c9001c4301cc114c7d49e8cf942a4bcf3640..9e61544932dbc9b8ff9379b4d735b193870b26e6 100644 |
--- a/chrome/browser/about_flags.cc |
+++ b/chrome/browser/about_flags.cc |
@@ -374,6 +374,19 @@ const Experiment::Choice kNotificationCenterTrayBehaviorChoices[] = { |
message_center::switches::kNotificationCenterTrayBehavior, "unread" } |
}; |
+const Experiment::Choice kTouchScrollingModeChoices[] = { |
+ { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, |
+ { IDS_FLAGS_TOUCH_SCROLLING_MODE_TOUCHCANCEL, |
+ switches::kTouchScrollingMode, |
+ switches::kTouchScrollingModeTouchcancel }, |
+ { IDS_FLAGS_TOUCH_SCROLLING_MODE_ABSORB_TOUCHMOVE, |
+ switches::kTouchScrollingMode, |
+ switches::kTouchScrollingModeAbsorbTouchmove }, |
+ { IDS_FLAGS_TOUCH_SCROLLING_MODE_SYNC_TOUCHMOVE, |
+ switches::kTouchScrollingMode, |
+ switches::kTouchScrollingModeSyncTouchmove }, |
+}; |
+ |
// RECORDING USER METRICS FOR FLAGS: |
// ----------------------------------------------------------------------------- |
// The first line of the experiment is the internal name. If you'd like to |
@@ -1882,6 +1895,13 @@ const Experiment kExperiments[] = { |
SINGLE_VALUE_TYPE(app_list::switches::kEnableExperimentalAppList) |
}, |
#endif |
+ { |
+ "touch-scrolling-mode", |
+ IDS_FLAGS_TOUCH_SCROLLING_MODE_NAME, |
+ IDS_FLAGS_TOUCH_SCROLLING_MODE_DESCRIPTION, |
+ kOsWin | kOsLinux | kOsCrOS | kOsAndroid, |
+ MULTI_VALUE_TYPE(kTouchScrollingModeChoices) |
+ }, |
}; |
const Experiment* experiments = kExperiments; |