| 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 COMPONENTS_MUS_PUBLIC_CPP_TESTS_TEST_WINDOW_TREE_CLIENT_SETUP_H_ | 5 #ifndef SERVICES_UI_PUBLIC_CPP_TESTS_TEST_WINDOW_TREE_CLIENT_SETUP_H_ |
| 6 #define COMPONENTS_MUS_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 #include "components/mus/public/cpp/window_tree_client_observer.h" | 11 #include "services/ui/public/cpp/window_tree_client_observer.h" |
| 12 | 12 |
| 13 namespace display { | 13 namespace display { |
| 14 class Display; | 14 class Display; |
| 15 } | 15 } |
| 16 | 16 |
| 17 namespace mus { | 17 namespace mus { |
| 18 | 18 |
| 19 class TestWindowTree; | 19 class TestWindowTree; |
| 20 class WindowManagerDelegate; | 20 class WindowManagerDelegate; |
| 21 class WindowTreeClient; | 21 class WindowTreeClient; |
| (...skipping 30 matching lines...) Expand all Loading... |
| 52 // See description of WindowTreeClientDelegate for details on ownership. The | 52 // See description of WindowTreeClientDelegate for details on ownership. The |
| 53 // WindowTreeClient may be deleted during shutdown by the test. If not, | 53 // WindowTreeClient may be deleted during shutdown by the test. If not, |
| 54 // we own it and must delete it. | 54 // we own it and must delete it. |
| 55 std::unique_ptr<WindowTreeClient> window_tree_client_; | 55 std::unique_ptr<WindowTreeClient> window_tree_client_; |
| 56 | 56 |
| 57 DISALLOW_COPY_AND_ASSIGN(TestWindowTreeClientSetup); | 57 DISALLOW_COPY_AND_ASSIGN(TestWindowTreeClientSetup); |
| 58 }; | 58 }; |
| 59 | 59 |
| 60 } // namespace mus | 60 } // namespace mus |
| 61 | 61 |
| 62 #endif // COMPONENTS_MUS_PUBLIC_CPP_TESTS_TEST_WINDOW_TREE_CLIENT_SETUP_H_ | 62 #endif // SERVICES_UI_PUBLIC_CPP_TESTS_TEST_WINDOW_TREE_CLIENT_SETUP_H_ |
| OLD | NEW |