| 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/env.h" | 7 #include "ui/aura/env.h" |
| 8 #include "ui/aura/monitor_manager.h" | 8 #include "ui/aura/monitor_manager.h" |
| 9 #include "ui/aura/root_window.h" | 9 #include "ui/aura/root_window.h" |
| 10 #include "ui/aura/test/single_monitor_manager.h" | 10 #include "ui/aura/single_monitor_manager.h" |
| 11 #include "ui/aura/test/test_stacking_client.h" | 11 #include "ui/aura/test/test_stacking_client.h" |
| 12 #include "ui/aura/ui_controls_aura.h" | 12 #include "ui/aura/ui_controls_aura.h" |
| 13 #include "ui/base/gestures/gesture_configuration.h" | 13 #include "ui/base/gestures/gesture_configuration.h" |
| 14 #include "ui/ui_controls/ui_controls.h" | 14 #include "ui/ui_controls/ui_controls.h" |
| 15 | 15 |
| 16 #if defined(USE_ASH) | 16 #if defined(USE_ASH) |
| 17 #include "ui/aura/test/test_screen.h" | 17 #include "ui/aura/test/test_screen.h" |
| 18 #endif | 18 #endif |
| 19 | 19 |
| 20 namespace aura { | 20 namespace aura { |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 72 root_window_.reset(); | 72 root_window_.reset(); |
| 73 testing::Test::TearDown(); | 73 testing::Test::TearDown(); |
| 74 } | 74 } |
| 75 | 75 |
| 76 void AuraTestBase::RunAllPendingInMessageLoop() { | 76 void AuraTestBase::RunAllPendingInMessageLoop() { |
| 77 helper_.RunAllPendingInMessageLoop(root_window()); | 77 helper_.RunAllPendingInMessageLoop(root_window()); |
| 78 } | 78 } |
| 79 | 79 |
| 80 } // namespace test | 80 } // namespace test |
| 81 } // namespace aura | 81 } // namespace aura |
| OLD | NEW |