| 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 <memory> | 8 #include <memory> |
| 9 | 9 |
| 10 #include "ash/common/material_design/material_design_controller.h" | 10 #include "ash/common/material_design/material_design_controller.h" |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 AshTestEnvironment* ash_test_environment_; // Not owned. | 78 AshTestEnvironment* ash_test_environment_; // Not owned. |
| 79 TestShellDelegate* test_shell_delegate_; // Owned by ash::Shell. | 79 TestShellDelegate* test_shell_delegate_; // Owned by ash::Shell. |
| 80 std::unique_ptr<ui::ScopedAnimationDurationScaleMode> zero_duration_mode_; | 80 std::unique_ptr<ui::ScopedAnimationDurationScaleMode> zero_duration_mode_; |
| 81 | 81 |
| 82 // Owned by ash::AcceleratorController | 82 // Owned by ash::AcceleratorController |
| 83 TestScreenshotDelegate* test_screenshot_delegate_; | 83 TestScreenshotDelegate* test_screenshot_delegate_; |
| 84 | 84 |
| 85 std::unique_ptr<::wm::WMState> wm_state_; | 85 std::unique_ptr<::wm::WMState> wm_state_; |
| 86 std::unique_ptr<AshTestViewsDelegate> views_delegate_; | 86 std::unique_ptr<AshTestViewsDelegate> views_delegate_; |
| 87 | 87 |
| 88 #if defined(OS_CHROMEOS) | |
| 89 // Check if DBus Thread Manager was initialized here. | 88 // Check if DBus Thread Manager was initialized here. |
| 90 bool dbus_thread_manager_initialized_; | 89 bool dbus_thread_manager_initialized_; |
| 91 // Check if Bluez DBus Manager was initialized here. | 90 // Check if Bluez DBus Manager was initialized here. |
| 92 bool bluez_dbus_manager_initialized_; | 91 bool bluez_dbus_manager_initialized_; |
| 93 #endif | |
| 94 | 92 |
| 95 std::unique_ptr<test::MaterialDesignControllerTestAPI> material_design_state_; | 93 std::unique_ptr<test::MaterialDesignControllerTestAPI> material_design_state_; |
| 96 | 94 |
| 97 DISALLOW_COPY_AND_ASSIGN(AshTestHelper); | 95 DISALLOW_COPY_AND_ASSIGN(AshTestHelper); |
| 98 }; | 96 }; |
| 99 | 97 |
| 100 } // namespace test | 98 } // namespace test |
| 101 } // namespace ash | 99 } // namespace ash |
| 102 | 100 |
| 103 #endif // ASH_TEST_ASH_TEST_HELPER_H_ | 101 #endif // ASH_TEST_ASH_TEST_HELPER_H_ |
| OLD | NEW |