summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorwjmaclean@google.com <wjmaclean@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-13 17:16:35 +0000
committerwjmaclean@google.com <wjmaclean@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-13 17:16:35 +0000
commite755a38521ce846021826bdaff698e4151e923c4 (patch)
tree053ea7b30b391c366024723b0f1ca00c62d65b2e /chrome
parent6d454d91a3aed4119a787c0deaa444faaf68f583 (diff)
downloadchromium_src-e755a38521ce846021826bdaff698e4151e923c4.zip
chromium_src-e755a38521ce846021826bdaff698e4151e923c4.tar.gz
chromium_src-e755a38521ce846021826bdaff698e4151e923c4.tar.bz2
Add plumbing to add highlight flag to about:flags, disable by default
BUG=none Review URL: https://chromiumcodereview.appspot.com/10910235 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156569 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/app/generated_resources.grd6
-rw-r--r--chrome/browser/about_flags.cc7
-rw-r--r--chrome/browser/chromeos/login/login_utils.cc1
3 files changed, 14 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index d7cb5ec9..ffce8d3 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -5865,6 +5865,12 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_FLAGS_ENABLE_INSTANT_EXTENDED_API_DESCRIPTION" desc="Description for the flag to enable the Instant extended API.">
Enable the Instant extended API.
</message>
+ <message name="IDS_FLAGS_ENABLE_GESTURE_TAP_HIGHLIGHTING_NAME" desc="Title for the flag to turn on gesture tap highlighting">
+ Gesture Tap Highlighting
+ </message>
+ <message name="IDS_FLAGS_ENABLE_GESTURE_TAP_HIGHLIGHTING_DESCRIPTION" desc="Description for the flag to turn on gesture tap highlighting">
+ Enable the experimental gesture tap highlight implementation.
+ </message>
<message name="IDS_FLAGS_ENABLE_SMOOTH_SCROLLING_NAME" desc="Title for the flag to turn on smooth scrolling">
Smooth Scrolling
</message>
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index cee0439..0ef9f4c 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -455,6 +455,13 @@ const Experiment kExperiments[] = {
SINGLE_VALUE_TYPE(switches::kDisableSyncAppNotifications)
},
{
+ "enable-gesture-tap-highlight",
+ IDS_FLAGS_ENABLE_GESTURE_TAP_HIGHLIGHTING_NAME,
+ IDS_FLAGS_ENABLE_GESTURE_TAP_HIGHLIGHTING_DESCRIPTION,
+ kOsLinux | kOsCrOS,
+ SINGLE_VALUE_TYPE(switches::kEnableGestureTapHighlight)
+ },
+ {
"enable-smooth-scrolling", // FLAGS:RECORD_UMA
IDS_FLAGS_ENABLE_SMOOTH_SCROLLING_NAME,
IDS_FLAGS_ENABLE_SMOOTH_SCROLLING_DESCRIPTION,
diff --git a/chrome/browser/chromeos/login/login_utils.cc b/chrome/browser/chromeos/login/login_utils.cc
index 3bba890..2720da2 100644
--- a/chrome/browser/chromeos/login/login_utils.cc
+++ b/chrome/browser/chromeos/login/login_utils.cc
@@ -762,6 +762,7 @@ std::string LoginUtilsImpl::GetOffTheRecordCommandLine(
::switches::kEnablePartialSwap,
::switches::kEnableUIReleaseFrontSurface,
::switches::kEnablePinch,
+ ::switches::kEnableGestureTapHighlight,
::switches::kEnableSmoothScrolling,
::switches::kEnableThreadedCompositing,
::switches::kEnableTouchCalibration,