| 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 "base/message_loop/message_loop.h" | 7 #include "base/message_loop/message_loop.h" |
| 8 #include "base/run_loop.h" | 8 #include "base/run_loop.h" |
| 9 #include "ui/aura/client/aura_constants.h" | 9 #include "ui/aura/client/aura_constants.h" |
| 10 #include "ui/aura/client/default_capture_client.h" | 10 #include "ui/aura/client/default_capture_client.h" |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 87 stacking_client_.reset(); | 87 stacking_client_.reset(); |
| 88 capture_client_.reset(); | 88 capture_client_.reset(); |
| 89 focus_client_.reset(); | 89 focus_client_.reset(); |
| 90 client::SetFocusClient(root_window(), NULL); | 90 client::SetFocusClient(root_window(), NULL); |
| 91 host_.reset(); | 91 host_.reset(); |
| 92 ui::GestureRecognizer::Reset(); | 92 ui::GestureRecognizer::Reset(); |
| 93 test_screen_.reset(); | 93 test_screen_.reset(); |
| 94 gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, NULL); | 94 gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, NULL); |
| 95 | 95 |
| 96 #if defined(USE_X11) | 96 #if defined(USE_X11) |
| 97 ui::ResetXCursorCache(); | 97 ui::test::ResetXCursorCache(); |
| 98 #endif | 98 #endif |
| 99 | 99 |
| 100 ui::ShutdownInputMethodForTesting(); | 100 ui::ShutdownInputMethodForTesting(); |
| 101 | 101 |
| 102 Env::DeleteInstance(); | 102 Env::DeleteInstance(); |
| 103 } | 103 } |
| 104 | 104 |
| 105 void AuraTestHelper::RunAllPendingInMessageLoop() { | 105 void AuraTestHelper::RunAllPendingInMessageLoop() { |
| 106 // TODO(jbates) crbug.com/134753 Find quitters of this RunLoop and have them | 106 // TODO(jbates) crbug.com/134753 Find quitters of this RunLoop and have them |
| 107 // use run_loop.QuitClosure(). | 107 // use run_loop.QuitClosure(). |
| 108 base::RunLoop run_loop; | 108 base::RunLoop run_loop; |
| 109 run_loop.RunUntilIdle(); | 109 run_loop.RunUntilIdle(); |
| 110 } | 110 } |
| 111 | 111 |
| 112 } // namespace test | 112 } // namespace test |
| 113 } // namespace aura | 113 } // namespace aura |
| OLD | NEW |