OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "views/test/views_test_base.h" | 5 #include "ui/views/test/views_test_base.h" |
6 | 6 |
7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
8 #include <ole2.h> | 8 #include <ole2.h> |
9 #endif | 9 #endif |
10 | 10 |
11 #if defined(USE_AURA) | 11 #if defined(USE_AURA) |
12 #include "ui/aura/desktop.h" | 12 #include "ui/aura/desktop.h" |
13 #include "ui/aura/test/test_stacking_client.h" | 13 #include "ui/aura/test/test_stacking_client.h" |
14 #endif | 14 #endif |
15 | 15 |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
55 void ViewsTestBase::RunPendingMessages() { | 55 void ViewsTestBase::RunPendingMessages() { |
56 #if defined(USE_AURA) | 56 #if defined(USE_AURA) |
57 message_loop_.RunAllPendingWithDispatcher( | 57 message_loop_.RunAllPendingWithDispatcher( |
58 aura::Desktop::GetInstance()->GetDispatcher()); | 58 aura::Desktop::GetInstance()->GetDispatcher()); |
59 #else | 59 #else |
60 message_loop_.RunAllPending(); | 60 message_loop_.RunAllPending(); |
61 #endif | 61 #endif |
62 } | 62 } |
63 | 63 |
64 } // namespace views | 64 } // namespace views |
OLD | NEW |