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

Unified Diff: ui/aura/test/aura_test_base.cc

Issue 630003003: Change GestureConfiguration types to be consistent with each other and with the (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Really fix compile Created 6 years, 2 months 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
« no previous file with comments | « ui/aura/gestures/gesture_recognizer_unittest.cc ('k') | ui/aura/window_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/test/aura_test_base.cc
diff --git a/ui/aura/test/aura_test_base.cc b/ui/aura/test/aura_test_base.cc
index 039661dc5609884801dd8012be7980e4a8d52877..a6271cc97509b3598b64e8afdd84050c09f2c9f5 100644
--- a/ui/aura/test/aura_test_base.cc
+++ b/ui/aura/test/aura_test_base.cc
@@ -37,21 +37,20 @@ void AuraTestBase::SetUp() {
// Changing the parameters for gesture recognition shouldn't cause
// tests to fail, so we use a separate set of parameters for unit
// testing.
- ui::GestureConfiguration::set_long_press_time_in_seconds(1.0);
- ui::GestureConfiguration::set_semi_long_press_time_in_seconds(0.4);
+ ui::GestureConfiguration::set_long_press_time_in_ms(1000);
+ ui::GestureConfiguration::set_semi_long_press_time_in_ms(400);
ui::GestureConfiguration::set_show_press_delay_in_ms(5);
ui::GestureConfiguration::set_max_distance_for_two_finger_tap_in_pixels(300);
- ui::GestureConfiguration::set_max_seconds_between_double_click(0.7);
+ ui::GestureConfiguration::set_max_time_between_double_click_in_ms(700);
ui::GestureConfiguration::
set_max_separation_for_gesture_touches_in_pixels(150);
- ui::GestureConfiguration::
- set_max_touch_down_duration_in_seconds_for_click(0.8);
+ ui::GestureConfiguration::set_max_touch_down_duration_for_click_in_ms(800);
ui::GestureConfiguration::set_max_touch_move_in_pixels_for_click(5);
ui::GestureConfiguration::set_max_distance_between_taps_for_double_tap(20);
ui::GestureConfiguration::set_min_distance_for_pinch_scroll_in_pixels(20);
ui::GestureConfiguration::set_min_pinch_update_distance_in_pixels(5);
ui::GestureConfiguration::set_default_radius(0);
- ui::GestureConfiguration::set_fling_velocity_cap(15000.0f);
+ ui::GestureConfiguration::set_fling_velocity_cap(15000);
ui::GestureConfiguration::set_min_swipe_speed(10);
// The ContextFactory must exist before any Compositors are created.
« no previous file with comments | « ui/aura/gestures/gesture_recognizer_unittest.cc ('k') | ui/aura/window_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698