| 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 SERVICES_UI_PUBLIC_CPP_TESTS_TEST_WINDOW_TREE_CLIENT_SETUP_H_ | 5 #ifndef SERVICES_UI_PUBLIC_CPP_TESTS_TEST_WINDOW_TREE_CLIENT_SETUP_H_ |
| 6 #define SERVICES_UI_PUBLIC_CPP_TESTS_TEST_WINDOW_TREE_CLIENT_SETUP_H_ | 6 #define SERVICES_UI_PUBLIC_CPP_TESTS_TEST_WINDOW_TREE_CLIENT_SETUP_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 | 9 |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| 11 | 11 |
| 12 namespace display { | |
| 13 class Display; | |
| 14 } | |
| 15 | |
| 16 namespace ui { | 12 namespace ui { |
| 17 | 13 |
| 18 class TestWindowTree; | 14 class TestWindowTree; |
| 19 class WindowManagerDelegate; | 15 class WindowManagerDelegate; |
| 20 class WindowTreeClient; | 16 class WindowTreeClient; |
| 21 class WindowTreeClientDelegate; | 17 class WindowTreeClientDelegate; |
| 22 | 18 |
| 23 // TestWindowTreeClientSetup is used to create a WindowTreeClient that is not | 19 // TestWindowTreeClientSetup is used to create a WindowTreeClient that is not |
| 24 // connected to mus. | 20 // connected to mus. |
| 25 class TestWindowTreeClientSetup { | 21 class TestWindowTreeClientSetup { |
| (...skipping 22 matching lines...) Expand all Loading... |
| 48 std::unique_ptr<TestWindowTree> window_tree_; | 44 std::unique_ptr<TestWindowTree> window_tree_; |
| 49 | 45 |
| 50 std::unique_ptr<WindowTreeClient> window_tree_client_; | 46 std::unique_ptr<WindowTreeClient> window_tree_client_; |
| 51 | 47 |
| 52 DISALLOW_COPY_AND_ASSIGN(TestWindowTreeClientSetup); | 48 DISALLOW_COPY_AND_ASSIGN(TestWindowTreeClientSetup); |
| 53 }; | 49 }; |
| 54 | 50 |
| 55 } // namespace ui | 51 } // namespace ui |
| 56 | 52 |
| 57 #endif // SERVICES_UI_PUBLIC_CPP_TESTS_TEST_WINDOW_TREE_CLIENT_SETUP_H_ | 53 #endif // SERVICES_UI_PUBLIC_CPP_TESTS_TEST_WINDOW_TREE_CLIENT_SETUP_H_ |
| OLD | NEW |