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 #ifndef UI_AURA_TEST_AURA_TEST_HELPER_H_ | 5 #ifndef UI_AURA_TEST_AURA_TEST_HELPER_H_ |
6 #define UI_AURA_TEST_AURA_TEST_HELPER_H_ | 6 #define UI_AURA_TEST_AURA_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_event_dispatcher.h" | 10 #include "ui/aura/window_event_dispatcher.h" |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
53 | 53 |
54 TestScreen* test_screen() { return test_screen_.get(); } | 54 TestScreen* test_screen() { return test_screen_.get(); } |
55 | 55 |
56 private: | 56 private: |
57 base::MessageLoopForUI* message_loop_; | 57 base::MessageLoopForUI* message_loop_; |
58 bool setup_called_; | 58 bool setup_called_; |
59 bool teardown_called_; | 59 bool teardown_called_; |
60 scoped_ptr<WindowTreeHost> host_; | 60 scoped_ptr<WindowTreeHost> host_; |
61 scoped_ptr<TestWindowTreeClient> stacking_client_; | 61 scoped_ptr<TestWindowTreeClient> stacking_client_; |
62 scoped_ptr<client::DefaultCaptureClient> capture_client_; | 62 scoped_ptr<client::DefaultCaptureClient> capture_client_; |
63 scoped_ptr<ui::InputMethod> test_input_method_; | |
64 scoped_ptr<client::FocusClient> focus_client_; | 63 scoped_ptr<client::FocusClient> focus_client_; |
65 scoped_ptr<TestScreen> test_screen_; | 64 scoped_ptr<TestScreen> test_screen_; |
66 scoped_ptr<ui::ScopedAnimationDurationScaleMode> zero_duration_mode_; | 65 scoped_ptr<ui::ScopedAnimationDurationScaleMode> zero_duration_mode_; |
67 | 66 |
68 DISALLOW_COPY_AND_ASSIGN(AuraTestHelper); | 67 DISALLOW_COPY_AND_ASSIGN(AuraTestHelper); |
69 }; | 68 }; |
70 | 69 |
71 } // namespace test | 70 } // namespace test |
72 } // namespace aura | 71 } // namespace aura |
73 | 72 |
74 #endif // UI_AURA_TEST_AURA_TEST_HELPER_H_ | 73 #endif // UI_AURA_TEST_AURA_TEST_HELPER_H_ |
OLD | NEW |