| Index: chrome/browser/about_flags.cc
|
| diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
| index 612d4e73a43362aba5be22ff11a0c2f648b97ad1..c52c344e62f458bdedab04f8f03a04d742efbc57 100644
|
| --- a/chrome/browser/about_flags.cc
|
| +++ b/chrome/browser/about_flags.cc
|
| @@ -1028,13 +1028,22 @@ const Experiment kExperiments[] = {
|
| kOsCrOS,
|
| SINGLE_VALUE_TYPE(ash::switches::kAshEnableTouchViewTesting),
|
| },
|
| +#if defined(OS_CHROMEOS)
|
| + {
|
| + "ash-enable-touch-view-touch-feedback",
|
| + IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TOUCH_FEEDBACK_NAME,
|
| + IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TOUCH_FEEDBACK_DESCRIPTION,
|
| + kOsCrOS,
|
| + SINGLE_VALUE_TYPE(ash::switches::kAshEnableTouchViewTouchFeedback),
|
| + },
|
| +#endif // defined(OS_CHROMEOS)
|
| { "ash-disable-text-filtering-in-overview-mode",
|
| IDS_FLAGS_ASH_DISABLE_TEXT_FILTERING_IN_OVERVIEW_MODE_NAME,
|
| IDS_FLAGS_ASH_DISABLE_TEXT_FILTERING_IN_OVERVIEW_MODE_DESCRIPTION,
|
| kOsCrOS,
|
| SINGLE_VALUE_TYPE(ash::switches::kAshDisableTextFilteringInOverviewMode),
|
| },
|
| -#endif
|
| +#endif // defined(USE_ASH)
|
| #if defined(OS_CHROMEOS)
|
| {
|
| "enable-carrier-switching",
|
|
|