Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(279)

Unified Diff: chrome/browser/about_flags.cc

Issue 2467913002: Touch event flag should control only DOM event firing. (Closed)
Patch Set: Merge branch 'master' of https://chromium.googlesource.com/chromium/src into patchtoflags Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/about_flags.cc
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 271f618a372c582235f010fc487ce5795a1b47ed..85207e8faf628c36ada567120c5f69b0bd76ad4f 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -132,16 +132,6 @@ namespace {
const unsigned kOsAll = kOsMac | kOsWin | kOsLinux | kOsCrOS | kOsAndroid;
const unsigned kOsDesktop = kOsMac | kOsWin | kOsLinux | kOsCrOS;
-const FeatureEntry::Choice kTouchEventsChoices[] = {
- { IDS_GENERIC_EXPERIMENT_CHOICE_AUTOMATIC, "", "" },
- { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
- switches::kTouchEvents,
- switches::kTouchEventsEnabled },
- { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
- switches::kTouchEvents,
- switches::kTouchEventsDisabled }
-};
-
#if defined(USE_AURA)
const FeatureEntry::Choice kOverscrollHistoryNavigationChoices[] = {
{ IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, "", "" },
@@ -861,9 +851,9 @@ const FeatureEntry kFeatureEntries[] = {
{"secondary-ui-md", IDS_FLAGS_SECONDARY_UI_MD,
IDS_FLAGS_SECONDARY_UI_MD_DESCRIPTION, kOsDesktop,
SINGLE_VALUE_TYPE(switches::kExtendMdToSecondaryUi)},
- {"touch-events", IDS_FLAGS_TOUCH_EVENTS_NAME,
+ {"touch-event-api", IDS_FLAGS_TOUCH_EVENTS_NAME,
mustaq 2016/11/15 20:33:58 Leave it as "touch-events". The |internal_name| sh
sunyunjia 2016/11/16 16:39:57 Done.
IDS_FLAGS_TOUCH_EVENTS_DESCRIPTION, kOsDesktop,
- MULTI_VALUE_TYPE(kTouchEventsChoices)},
+ SINGLE_DISABLE_VALUE_TYPE(switches::kDisableTouchEventAPI)},
mustaq 2016/11/15 20:33:58 The same reason as above: don't changed the expose
sunyunjia 2016/11/16 16:39:58 Done.
{"disable-touch-adjustment", IDS_FLAGS_TOUCH_ADJUSTMENT_NAME,
IDS_FLAGS_TOUCH_ADJUSTMENT_DESCRIPTION,
kOsWin | kOsLinux | kOsCrOS | kOsAndroid,

Powered by Google App Engine
This is Rietveld 408576698