OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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_MUS_TEST_WM_TEST_HELPER_H_ | 5 #ifndef ASH_MUS_TEST_WM_TEST_HELPER_H_ |
6 #define ASH_MUS_TEST_WM_TEST_HELPER_H_ | 6 #define ASH_MUS_TEST_WM_TEST_HELPER_H_ |
7 | 7 |
8 #include <memory> | 8 #include <memory> |
9 | 9 |
10 #include "ash/mus/window_manager_application.h" | 10 #include "ash/mus/window_manager_application.h" |
11 #include "base/macros.h" | 11 #include "base/macros.h" |
12 #include "ui/aura/test/mus/test_window_tree_client_setup.h" | 12 #include "ui/aura/test/mus/test_window_tree_client_setup.h" |
13 | 13 |
14 namespace aura { | 14 namespace aura { |
15 class WindowTreeClientPrivate; | 15 class WindowTreeClientPrivate; |
16 } | 16 } |
17 | 17 |
18 namespace base { | 18 namespace base { |
19 class MessageLoop; | 19 class MessageLoop; |
20 class SequencedWorkerPoolOwner; | 20 class SequencedWorkerPoolOwner; |
21 } | 21 } |
22 | 22 |
| 23 namespace ui { |
| 24 class InputDeviceClient; |
| 25 } |
| 26 |
23 namespace views { | 27 namespace views { |
24 class ViewsDelegate; | 28 class ViewsDelegate; |
25 } | 29 } |
26 | 30 |
27 namespace ash { | 31 namespace ash { |
28 | 32 |
29 class RootWindowController; | 33 class RootWindowController; |
30 | 34 |
31 namespace mus { | 35 namespace mus { |
32 | 36 |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
72 std::unique_ptr<views::ViewsDelegate> views_delegate_; | 76 std::unique_ptr<views::ViewsDelegate> views_delegate_; |
73 aura::TestWindowTreeClientSetup window_tree_client_setup_; | 77 aura::TestWindowTreeClientSetup window_tree_client_setup_; |
74 std::unique_ptr<WindowManagerApplication> window_manager_app_; | 78 std::unique_ptr<WindowManagerApplication> window_manager_app_; |
75 std::unique_ptr<aura::WindowTreeClientPrivate> window_tree_client_private_; | 79 std::unique_ptr<aura::WindowTreeClientPrivate> window_tree_client_private_; |
76 | 80 |
77 // Id for the next Display created by CreateRootWindowController(). | 81 // Id for the next Display created by CreateRootWindowController(). |
78 int64_t next_display_id_ = 1; | 82 int64_t next_display_id_ = 1; |
79 | 83 |
80 std::unique_ptr<base::SequencedWorkerPoolOwner> blocking_pool_owner_; | 84 std::unique_ptr<base::SequencedWorkerPoolOwner> blocking_pool_owner_; |
81 | 85 |
| 86 std::unique_ptr<ui::InputDeviceClient> input_device_client_; |
| 87 |
82 DISALLOW_COPY_AND_ASSIGN(WmTestHelper); | 88 DISALLOW_COPY_AND_ASSIGN(WmTestHelper); |
83 }; | 89 }; |
84 | 90 |
85 } // namespace mus | 91 } // namespace mus |
86 } // namespace ash | 92 } // namespace ash |
87 | 93 |
88 #endif // ASH_MUS_TEST_WM_TEST_HELPER_H_ | 94 #endif // ASH_MUS_TEST_WM_TEST_HELPER_H_ |
OLD | NEW |