Index: chrome/browser/about_flags.cc |
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc |
index f11a2c4e7db93665bbb9207f5aaa53e620109901..7397602d85647e880c9c9aaa063d04e9fdb5e8ef 100644 |
--- a/chrome/browser/about_flags.cc |
+++ b/chrome/browser/about_flags.cc |
@@ -372,6 +372,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 |
@@ -1908,6 +1921,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; |