| 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/root_window.h" | 10 #include "ui/aura/root_window.h" |
| 11 | 11 |
| 12 namespace base { | 12 namespace base { |
| 13 class MessageLoopForUI; | 13 class MessageLoopForUI; |
| 14 } | 14 } |
| 15 | 15 |
| 16 namespace gfx { | |
| 17 class SurfaceFactoryOzone; | |
| 18 } | |
| 19 | |
| 20 namespace ui { | 16 namespace ui { |
| 21 class InputMethod; | 17 class InputMethod; |
| 22 class ScopedAnimationDurationScaleMode; | 18 class ScopedAnimationDurationScaleMode; |
| 23 } | 19 } |
| 24 | 20 |
| 25 namespace aura { | 21 namespace aura { |
| 26 class TestScreen; | 22 class TestScreen; |
| 27 namespace client { | 23 namespace client { |
| 28 class DefaultActivationClient; | 24 class DefaultActivationClient; |
| 29 class DefaultCaptureClient; | 25 class DefaultCaptureClient; |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 62 bool owns_root_window_; | 58 bool owns_root_window_; |
| 63 scoped_ptr<RootWindow> root_window_; | 59 scoped_ptr<RootWindow> root_window_; |
| 64 scoped_ptr<TestWindowTreeClient> stacking_client_; | 60 scoped_ptr<TestWindowTreeClient> stacking_client_; |
| 65 scoped_ptr<client::DefaultActivationClient> activation_client_; | 61 scoped_ptr<client::DefaultActivationClient> activation_client_; |
| 66 scoped_ptr<client::DefaultCaptureClient> capture_client_; | 62 scoped_ptr<client::DefaultCaptureClient> capture_client_; |
| 67 scoped_ptr<ui::InputMethod> test_input_method_; | 63 scoped_ptr<ui::InputMethod> test_input_method_; |
| 68 scoped_ptr<client::FocusClient> focus_client_; | 64 scoped_ptr<client::FocusClient> focus_client_; |
| 69 scoped_ptr<TestScreen> test_screen_; | 65 scoped_ptr<TestScreen> test_screen_; |
| 70 scoped_ptr<ui::ScopedAnimationDurationScaleMode> zero_duration_mode_; | 66 scoped_ptr<ui::ScopedAnimationDurationScaleMode> zero_duration_mode_; |
| 71 | 67 |
| 72 #if defined(USE_OZONE) | |
| 73 scoped_ptr<gfx::SurfaceFactoryOzone> surface_factory_; | |
| 74 #endif | |
| 75 | |
| 76 DISALLOW_COPY_AND_ASSIGN(AuraTestHelper); | 68 DISALLOW_COPY_AND_ASSIGN(AuraTestHelper); |
| 77 }; | 69 }; |
| 78 | 70 |
| 79 } // namespace test | 71 } // namespace test |
| 80 } // namespace aura | 72 } // namespace aura |
| 81 | 73 |
| 82 #endif // UI_AURA_TEST_AURA_TEST_HELPER_H_ | 74 #endif // UI_AURA_TEST_AURA_TEST_HELPER_H_ |
| OLD | NEW |