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/client/window_tree_client.h" | 7 #include "ui/aura/client/window_tree_client.h" |
8 #include "ui/aura/root_window.h" | 8 #include "ui/aura/root_window.h" |
9 #include "ui/aura/test/aura_test_helper.h" | 9 #include "ui/aura/test/aura_test_helper.h" |
10 #include "ui/aura/test/test_window_delegate.h" | 10 #include "ui/aura/test/test_window_delegate.h" |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
62 0, 0.0166667f); | 62 0, 0.0166667f); |
63 ui::GestureConfiguration::set_fling_acceleration_curve_coefficients( | 63 ui::GestureConfiguration::set_fling_acceleration_curve_coefficients( |
64 1, -0.0238095f); | 64 1, -0.0238095f); |
65 ui::GestureConfiguration::set_fling_acceleration_curve_coefficients( | 65 ui::GestureConfiguration::set_fling_acceleration_curve_coefficients( |
66 2, 0.0452381f); | 66 2, 0.0452381f); |
67 ui::GestureConfiguration::set_fling_acceleration_curve_coefficients( | 67 ui::GestureConfiguration::set_fling_acceleration_curve_coefficients( |
68 3, 0.8f); | 68 3, 0.8f); |
69 ui::GestureConfiguration::set_fling_velocity_cap(15000.0f); | 69 ui::GestureConfiguration::set_fling_velocity_cap(15000.0f); |
70 | 70 |
71 helper_.reset(new AuraTestHelper(&message_loop_)); | 71 helper_.reset(new AuraTestHelper(&message_loop_)); |
72 helper_->SetUp(); | 72 bool allow_test_contexts = true; |
| 73 helper_->SetUp(allow_test_contexts); |
73 } | 74 } |
74 | 75 |
75 void AuraTestBase::TearDown() { | 76 void AuraTestBase::TearDown() { |
76 teardown_called_ = true; | 77 teardown_called_ = true; |
77 | 78 |
78 // Flush the message loop because we have pending release tasks | 79 // Flush the message loop because we have pending release tasks |
79 // and these tasks if un-executed would upset Valgrind. | 80 // and these tasks if un-executed would upset Valgrind. |
80 RunAllPendingInMessageLoop(); | 81 RunAllPendingInMessageLoop(); |
81 | 82 |
82 helper_->TearDown(); | 83 helper_->TearDown(); |
(...skipping 17 matching lines...) Expand all Loading... |
100 void AuraTestBase::RunAllPendingInMessageLoop() { | 101 void AuraTestBase::RunAllPendingInMessageLoop() { |
101 helper_->RunAllPendingInMessageLoop(); | 102 helper_->RunAllPendingInMessageLoop(); |
102 } | 103 } |
103 | 104 |
104 void AuraTestBase::ParentWindow(Window* window) { | 105 void AuraTestBase::ParentWindow(Window* window) { |
105 client::ParentWindowWithContext(window, root_window(), gfx::Rect()); | 106 client::ParentWindowWithContext(window, root_window(), gfx::Rect()); |
106 } | 107 } |
107 | 108 |
108 } // namespace test | 109 } // namespace test |
109 } // namespace aura | 110 } // namespace aura |
OLD | NEW |