| 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 <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <memory> | 10 #include <memory> |
| 11 #include <utility> | 11 #include <utility> |
| 12 #include <vector> | 12 #include <vector> |
| 13 | 13 |
| 14 #include "ash/test/test_session_controller_client.h" | 14 #include "ash/test/test_session_controller_client.h" |
| 15 #include "base/compiler_specific.h" | 15 #include "base/compiler_specific.h" |
| 16 #include "base/macros.h" | 16 #include "base/macros.h" |
| 17 #include "ui/aura/test/mus/test_window_tree_client_setup.h" | 17 #include "ui/aura/test/mus/test_window_tree_client_setup.h" |
| 18 | 18 |
| 19 namespace aura { | 19 namespace aura { |
| 20 class Window; | 20 class Window; |
| 21 class WindowTreeClientPrivate; | 21 class WindowTreeClientPrivate; |
| 22 } // namespace aura | 22 } |
| 23 | 23 |
| 24 namespace display { | 24 namespace display { |
| 25 class Display; | 25 class Display; |
| 26 } | 26 } |
| 27 | 27 |
| 28 namespace mash { | 28 namespace mash { |
| 29 namespace test { | 29 namespace test { |
| 30 class MashTestSuite; | 30 class MashTestSuite; |
| 31 } | 31 } |
| 32 } | 32 } |
| 33 | 33 |
| 34 namespace ui { | 34 namespace ui { |
| 35 class ScopedAnimationDurationScaleMode; | 35 class ScopedAnimationDurationScaleMode; |
| 36 } // namespace ui | 36 class InputDeviceClient; |
| 37 } |
| 37 | 38 |
| 38 namespace wm { | 39 namespace wm { |
| 39 class WMState; | 40 class WMState; |
| 40 } | 41 } |
| 41 | 42 |
| 42 namespace ash { | 43 namespace ash { |
| 43 | 44 |
| 44 class RootWindowController; | 45 class RootWindowController; |
| 45 | 46 |
| 46 enum class Config; | 47 enum class Config; |
| (...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 158 bool bluez_dbus_manager_initialized_; | 159 bool bluez_dbus_manager_initialized_; |
| 159 | 160 |
| 160 aura::TestWindowTreeClientSetup window_tree_client_setup_; | 161 aura::TestWindowTreeClientSetup window_tree_client_setup_; |
| 161 std::unique_ptr<mus::WindowManagerApplication> window_manager_app_; | 162 std::unique_ptr<mus::WindowManagerApplication> window_manager_app_; |
| 162 std::unique_ptr<aura::WindowTreeClientPrivate> window_tree_client_private_; | 163 std::unique_ptr<aura::WindowTreeClientPrivate> window_tree_client_private_; |
| 163 // Id for the next Display created by CreateRootWindowController(). | 164 // Id for the next Display created by CreateRootWindowController(). |
| 164 int64_t next_display_id_ = 1; | 165 int64_t next_display_id_ = 1; |
| 165 | 166 |
| 166 std::unique_ptr<TestSessionControllerClient> session_controller_client_; | 167 std::unique_ptr<TestSessionControllerClient> session_controller_client_; |
| 167 | 168 |
| 169 std::unique_ptr<ui::InputDeviceClient> input_device_client_; |
| 170 |
| 168 DISALLOW_COPY_AND_ASSIGN(AshTestHelper); | 171 DISALLOW_COPY_AND_ASSIGN(AshTestHelper); |
| 169 }; | 172 }; |
| 170 | 173 |
| 171 } // namespace test | 174 } // namespace test |
| 172 } // namespace ash | 175 } // namespace ash |
| 173 | 176 |
| 174 #endif // ASH_TEST_ASH_TEST_HELPER_H_ | 177 #endif // ASH_TEST_ASH_TEST_HELPER_H_ |
| OLD | NEW |