OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 #ifndef ATHENA_TEST_ATHENA_TEST_HELPER_H_ | 5 #ifndef ATHENA_TEST_ATHENA_TEST_HELPER_H_ |
6 #define ATHENA_TEST_ATHENA_TEST_HELPER_H_ | 6 #define ATHENA_TEST_ATHENA_TEST_HELPER_H_ |
7 | 7 |
8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "ui/aura/window_tree_host.h" | 10 #include "ui/aura/window_tree_host.h" |
11 | 11 |
12 namespace base { | 12 namespace base { |
13 class MessageLoopForUI; | 13 class MessageLoopForUI; |
| 14 class Thread; |
14 } | 15 } |
15 | 16 |
16 namespace ui { | 17 namespace ui { |
17 class ContextFactory; | 18 class ContextFactory; |
18 class ScopedAnimationDurationScaleMode; | 19 class ScopedAnimationDurationScaleMode; |
19 } | 20 } |
20 | 21 |
21 namespace aura { | 22 namespace aura { |
22 class Window; | 23 class Window; |
23 class TestScreen; | 24 class TestScreen; |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
61 bool teardown_called_; | 62 bool teardown_called_; |
62 | 63 |
63 base::MessageLoopForUI* message_loop_; | 64 base::MessageLoopForUI* message_loop_; |
64 | 65 |
65 scoped_ptr<aura::WindowTreeHost> host_; | 66 scoped_ptr<aura::WindowTreeHost> host_; |
66 scoped_ptr<aura::TestScreen> test_screen_; | 67 scoped_ptr<aura::TestScreen> test_screen_; |
67 scoped_ptr<TestScreenManagerDelegate> screen_manager_delegate_; | 68 scoped_ptr<TestScreenManagerDelegate> screen_manager_delegate_; |
68 scoped_ptr<aura::client::FocusClient> focus_client_; | 69 scoped_ptr<aura::client::FocusClient> focus_client_; |
69 scoped_ptr< ::wm::InputMethodEventFilter> input_method_filter_; | 70 scoped_ptr< ::wm::InputMethodEventFilter> input_method_filter_; |
70 scoped_ptr<ui::ScopedAnimationDurationScaleMode> zero_duration_mode_; | 71 scoped_ptr<ui::ScopedAnimationDurationScaleMode> zero_duration_mode_; |
| 72 scoped_ptr<base::Thread> file_thread_; |
71 | 73 |
72 DISALLOW_COPY_AND_ASSIGN(AthenaTestHelper); | 74 DISALLOW_COPY_AND_ASSIGN(AthenaTestHelper); |
73 }; | 75 }; |
74 | 76 |
75 } // namespace test | 77 } // namespace test |
76 } // namespace athena | 78 } // namespace athena |
77 | 79 |
78 #endif // ATHENA_TEST_ATHENA_TEST_HELPER_H_ | 80 #endif // ATHENA_TEST_ATHENA_TEST_HELPER_H_ |
OLD | NEW |