| 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_helper.h" | 5 #include "ui/aura/test/aura_test_helper.h" |
| 6 | 6 |
| 7 #include "ui/aura/env.h" | 7 #include "ui/aura/env.h" |
| 8 #include "ui/aura/root_window.h" | 8 #include "ui/aura/root_window.h" |
| 9 #include "ui/gfx/compositor/layer_animator.h" | 9 #include "ui/compositor/layer_animator.h" |
| 10 | 10 |
| 11 namespace aura { | 11 namespace aura { |
| 12 namespace test { | 12 namespace test { |
| 13 | 13 |
| 14 AuraTestHelper::AuraTestHelper() | 14 AuraTestHelper::AuraTestHelper() |
| 15 : setup_called_(false), | 15 : setup_called_(false), |
| 16 teardown_called_(false) { | 16 teardown_called_(false) { |
| 17 // Disable animations during tests. | 17 // Disable animations during tests. |
| 18 ui::LayerAnimator::set_disable_animations_for_test(true); | 18 ui::LayerAnimator::set_disable_animations_for_test(true); |
| 19 } | 19 } |
| (...skipping 22 matching lines...) Expand all Loading... |
| 42 | 42 |
| 43 void AuraTestHelper::RunAllPendingInMessageLoop(RootWindow* root_window) { | 43 void AuraTestHelper::RunAllPendingInMessageLoop(RootWindow* root_window) { |
| 44 #if !defined(OS_MACOSX) | 44 #if !defined(OS_MACOSX) |
| 45 message_loop_.RunAllPendingWithDispatcher( | 45 message_loop_.RunAllPendingWithDispatcher( |
| 46 Env::GetInstance()->GetDispatcher()); | 46 Env::GetInstance()->GetDispatcher()); |
| 47 #endif | 47 #endif |
| 48 } | 48 } |
| 49 | 49 |
| 50 } // namespace test | 50 } // namespace test |
| 51 } // namespace aura | 51 } // namespace aura |
| OLD | NEW |