| OLD | NEW |
|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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_WINDOW_SERVER_TEST_BASE_H_ | 5 #ifndef SERVICES_UI_PUBLIC_CPP_TESTS_WINDOW_SERVER_TEST_BASE_H_ |
| 6 #define COMPONENTS_MUS_PUBLIC_CPP_TESTS_WINDOW_SERVER_TEST_BASE_H_ | 6 #define SERVICES_UI_PUBLIC_CPP_TESTS_WINDOW_SERVER_TEST_BASE_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/tests/window_server_shelltest_base.h" | |
| 12 #include "components/mus/public/cpp/window_manager_delegate.h" | |
| 13 #include "components/mus/public/cpp/window_tree_client_delegate.h" | |
| 14 #include "components/mus/public/interfaces/window_tree.mojom.h" | |
| 15 #include "components/mus/public/interfaces/window_tree_host.mojom.h" | |
| 16 #include "services/shell/public/cpp/interface_factory.h" | 11 #include "services/shell/public/cpp/interface_factory.h" |
| 12 #include "services/ui/public/cpp/tests/window_server_shelltest_base.h" |
| 13 #include "services/ui/public/cpp/window_manager_delegate.h" |
| 14 #include "services/ui/public/cpp/window_tree_client_delegate.h" |
| 15 #include "services/ui/public/interfaces/window_tree.mojom.h" |
| 16 #include "services/ui/public/interfaces/window_tree_host.mojom.h" |
| 17 | 17 |
| 18 namespace mus { | 18 namespace mus { |
| 19 | 19 |
| 20 // WindowServerTestBase is a base class for use with shell tests that use | 20 // WindowServerTestBase is a base class for use with shell tests that use |
| 21 // WindowServer. SetUp() connects to the WindowServer and blocks until OnEmbed() | 21 // WindowServer. SetUp() connects to the WindowServer and blocks until OnEmbed() |
| 22 // has been invoked. window_manager() can be used to access the WindowServer | 22 // has been invoked. window_manager() can be used to access the WindowServer |
| 23 // established as part of SetUp(). | 23 // established as part of SetUp(). |
| 24 class WindowServerTestBase | 24 class WindowServerTestBase |
| 25 : public WindowServerShellTestBase, | 25 : public WindowServerShellTestBase, |
| 26 public WindowTreeClientDelegate, | 26 public WindowTreeClientDelegate, |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 105 | 105 |
| 106 WindowManagerClient* window_manager_client_; | 106 WindowManagerClient* window_manager_client_; |
| 107 | 107 |
| 108 bool window_tree_client_destroyed_; | 108 bool window_tree_client_destroyed_; |
| 109 | 109 |
| 110 DISALLOW_COPY_AND_ASSIGN(WindowServerTestBase); | 110 DISALLOW_COPY_AND_ASSIGN(WindowServerTestBase); |
| 111 }; | 111 }; |
| 112 | 112 |
| 113 } // namespace mus | 113 } // namespace mus |
| 114 | 114 |
| 115 #endif // COMPONENTS_MUS_PUBLIC_CPP_TESTS_WINDOW_SERVER_TEST_BASE_H_ | 115 #endif // SERVICES_UI_PUBLIC_CPP_TESTS_WINDOW_SERVER_TEST_BASE_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2119963002:
Move mus to //services/ui (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master