OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ui/aura/test/aura_test_base.h" | 5 #include "ui/aura/test/aura_test_base.h" |
6 | 6 |
7 #include "ui/aura/test/aura_test_helper.h" | 7 #include "ui/aura/test/aura_test_helper.h" |
8 #include "ui/base/gestures/gesture_configuration.h" | 8 #include "ui/base/gestures/gesture_configuration.h" |
9 #include "ui/base/ime/text_input_test_support.h" | 9 #include "ui/base/ime/text_input_test_support.h" |
10 | 10 |
(...skipping 25 matching lines...) Expand all Loading... |
36 ui::GestureConfiguration::set_min_distance_for_pinch_scroll_in_pixels(20); | 36 ui::GestureConfiguration::set_min_distance_for_pinch_scroll_in_pixels(20); |
37 ui::GestureConfiguration::set_min_flick_speed_squared(550.f * 550.f); | 37 ui::GestureConfiguration::set_min_flick_speed_squared(550.f * 550.f); |
38 ui::GestureConfiguration::set_min_pinch_update_distance_in_pixels(5); | 38 ui::GestureConfiguration::set_min_pinch_update_distance_in_pixels(5); |
39 ui::GestureConfiguration::set_min_rail_break_velocity(200); | 39 ui::GestureConfiguration::set_min_rail_break_velocity(200); |
40 ui::GestureConfiguration::set_min_scroll_delta_squared(5 * 5); | 40 ui::GestureConfiguration::set_min_scroll_delta_squared(5 * 5); |
41 ui::GestureConfiguration:: | 41 ui::GestureConfiguration:: |
42 set_min_touch_down_duration_in_seconds_for_click(0.01); | 42 set_min_touch_down_duration_in_seconds_for_click(0.01); |
43 ui::GestureConfiguration::set_points_buffered_for_velocity(10); | 43 ui::GestureConfiguration::set_points_buffered_for_velocity(10); |
44 ui::GestureConfiguration::set_rail_break_proportion(15); | 44 ui::GestureConfiguration::set_rail_break_proportion(15); |
45 ui::GestureConfiguration::set_rail_start_proportion(2); | 45 ui::GestureConfiguration::set_rail_start_proportion(2); |
| 46 ui::GestureConfiguration::set_default_radius(0); |
46 helper_.reset(new AuraTestHelper(&message_loop_)); | 47 helper_.reset(new AuraTestHelper(&message_loop_)); |
47 helper_->SetUp(); | 48 helper_->SetUp(); |
48 } | 49 } |
49 | 50 |
50 void AuraTestBase::TearDown() { | 51 void AuraTestBase::TearDown() { |
51 // Flush the message loop because we have pending release tasks | 52 // Flush the message loop because we have pending release tasks |
52 // and these tasks if un-executed would upset Valgrind. | 53 // and these tasks if un-executed would upset Valgrind. |
53 RunAllPendingInMessageLoop(); | 54 RunAllPendingInMessageLoop(); |
54 | 55 |
55 helper_->TearDown(); | 56 helper_->TearDown(); |
56 ui::TextInputTestSupport::Shutdown(); | 57 ui::TextInputTestSupport::Shutdown(); |
57 testing::Test::TearDown(); | 58 testing::Test::TearDown(); |
58 } | 59 } |
59 | 60 |
60 void AuraTestBase::RunAllPendingInMessageLoop() { | 61 void AuraTestBase::RunAllPendingInMessageLoop() { |
61 helper_->RunAllPendingInMessageLoop(); | 62 helper_->RunAllPendingInMessageLoop(); |
62 } | 63 } |
63 | 64 |
64 } // namespace test | 65 } // namespace test |
65 } // namespace aura | 66 } // namespace aura |
OLD | NEW |