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 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
98 gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, NULL); | 98 gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, NULL); |
99 | 99 |
100 #if defined(USE_X11) | 100 #if defined(USE_X11) |
101 ui::ResetXCursorCache(); | 101 ui::ResetXCursorCache(); |
102 #endif | 102 #endif |
103 | 103 |
104 Env::DeleteInstance(); | 104 Env::DeleteInstance(); |
105 } | 105 } |
106 | 106 |
107 void AuraTestHelper::RunAllPendingInMessageLoop() { | 107 void AuraTestHelper::RunAllPendingInMessageLoop() { |
108 #if !defined(OS_MACOSX) | |
109 // TODO(jbates) crbug.com/134753 Find quitters of this RunLoop and have them | 108 // TODO(jbates) crbug.com/134753 Find quitters of this RunLoop and have them |
110 // use run_loop.QuitClosure(). | 109 // use run_loop.QuitClosure(). |
111 base::RunLoop run_loop(Env::GetInstance()->GetDispatcher()); | 110 base::RunLoop run_loop(Env::GetInstance()->GetDispatcher()); |
112 run_loop.RunUntilIdle(); | 111 run_loop.RunUntilIdle(); |
113 #endif | |
114 } | 112 } |
115 | 113 |
116 } // namespace test | 114 } // namespace test |
117 } // namespace aura | 115 } // namespace aura |
OLD | NEW |