OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 ASH_TEST_ASH_TEST_HELPER_H_ | 5 #ifndef ASH_TEST_ASH_TEST_HELPER_H_ |
6 #define ASH_TEST_ASH_TEST_HELPER_H_ | 6 #define ASH_TEST_ASH_TEST_HELPER_H_ |
7 | 7 |
8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 | 10 |
11 namespace aura { | 11 namespace aura { |
12 class Window; | 12 class Window; |
13 } // namespace aura | 13 } // namespace aura |
14 | 14 |
15 namespace base { | 15 namespace base { |
16 class MessageLoopForUI; | 16 class MessageLoopForUI; |
17 } // namespace base | 17 } // namespace base |
18 | 18 |
19 namespace ui { | 19 namespace ui { |
20 class ScopedAnimationDurationScaleMode; | 20 class ScopedAnimationDurationScaleMode; |
21 } // namespace ui | 21 } // namespace ui |
22 | 22 |
| 23 namespace views { |
| 24 namespace corewm { |
| 25 class WMState; |
| 26 } |
| 27 } |
| 28 |
23 namespace ash { | 29 namespace ash { |
24 namespace test { | 30 namespace test { |
25 | 31 |
26 class TestScreenshotDelegate; | 32 class TestScreenshotDelegate; |
27 class TestShellDelegate; | 33 class TestShellDelegate; |
28 | 34 |
29 // A helper class that does common initialization required for Ash. Creates a | 35 // A helper class that does common initialization required for Ash. Creates a |
30 // root window and an ash::Shell instance with a test delegate. | 36 // root window and an ash::Shell instance with a test delegate. |
31 class AshTestHelper { | 37 class AshTestHelper { |
32 public: | 38 public: |
(...skipping 22 matching lines...) Expand all Loading... |
55 } | 61 } |
56 | 62 |
57 private: | 63 private: |
58 base::MessageLoopForUI* message_loop_; // Not owned. | 64 base::MessageLoopForUI* message_loop_; // Not owned. |
59 TestShellDelegate* test_shell_delegate_; // Owned by ash::Shell. | 65 TestShellDelegate* test_shell_delegate_; // Owned by ash::Shell. |
60 scoped_ptr<ui::ScopedAnimationDurationScaleMode> zero_duration_mode_; | 66 scoped_ptr<ui::ScopedAnimationDurationScaleMode> zero_duration_mode_; |
61 | 67 |
62 // Owned by ash::AcceleratorController | 68 // Owned by ash::AcceleratorController |
63 TestScreenshotDelegate* test_screenshot_delegate_; | 69 TestScreenshotDelegate* test_screenshot_delegate_; |
64 | 70 |
| 71 scoped_ptr<views::corewm::WMState> wm_state_; |
| 72 |
65 // Check if DBus Thread Manager was initialized here. | 73 // Check if DBus Thread Manager was initialized here. |
66 bool dbus_thread_manager_initialized_; | 74 bool dbus_thread_manager_initialized_; |
67 | 75 |
68 DISALLOW_COPY_AND_ASSIGN(AshTestHelper); | 76 DISALLOW_COPY_AND_ASSIGN(AshTestHelper); |
69 }; | 77 }; |
70 | 78 |
71 } // namespace test | 79 } // namespace test |
72 } // namespace ash | 80 } // namespace ash |
73 | 81 |
74 #endif // ASH_TEST_ASH_TEST_HELPER_H_ | 82 #endif // ASH_TEST_ASH_TEST_HELPER_H_ |
OLD | NEW |