summaryrefslogtreecommitdiffstats
path: root/chrome/common/pref_names.h
diff options
context:
space:
mode:
authorpkasting <pkasting@chromium.org>2014-10-09 16:27:05 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-09 23:27:21 +0000
commit53aebab88d0b3304a5ba13ff08467fb2e39b674e (patch)
tree10873a8a2766cec67ebb42ac8358160be11f32cf /chrome/common/pref_names.h
parentbbc157765fb43670db2f14deae6a6b3e9d5e91c1 (diff)
downloadchromium_src-53aebab88d0b3304a5ba13ff08467fb2e39b674e.zip
chromium_src-53aebab88d0b3304a5ba13ff08467fb2e39b674e.tar.gz
chromium_src-53aebab88d0b3304a5ba13ff08467fb2e39b674e.tar.bz2
Change GestureConfiguration types to be consistent with each other and with the
types in GestureDetector::Config and other usage points. Basically: * Times should always be ints representing milliseconds * Distances and velocities should always be floats This eliminates a number of implicit type conversions, some of which trigger a (currently disabled) MSVC warning due to possible value truncation. BUG=81439 TEST=none Review URL: https://codereview.chromium.org/630003003 Cr-Commit-Position: refs/heads/master@{#299007}
Diffstat (limited to 'chrome/common/pref_names.h')
-rw-r--r--chrome/common/pref_names.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index a1364a6..72c45d5 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -760,8 +760,8 @@ extern const char kShowLogoutButtonInTray[];
#if defined(USE_AURA)
extern const char kMaxSeparationForGestureTouchesInPixels[];
-extern const char kSemiLongPressTimeInSeconds[];
-extern const char kTabScrubActivationDelayInMS[];
+extern const char kSemiLongPressTimeInMs[];
+extern const char kTabScrubActivationDelayInMs[];
extern const char kFlingMaxCancelToDownTimeInMs[];
extern const char kFlingMaxTapGapTimeInMs[];
extern const char kOverscrollHorizontalThresholdComplete[];