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 #include <stdint.h> | 5 #include <stdint.h> |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "ash/public/interfaces/user_window_controller.mojom.h" | 10 #include "ash/public/interfaces/user_window_controller.mojom.h" |
11 #include "base/bind.h" | 11 #include "base/bind.h" |
12 #include "base/macros.h" | 12 #include "base/macros.h" |
13 #include "base/run_loop.h" | 13 #include "base/run_loop.h" |
14 #include "components/mus/public/cpp/window.h" | |
15 #include "components/mus/public/cpp/window_tree_client.h" | |
16 #include "components/mus/public/cpp/window_tree_client_delegate.h" | |
17 #include "components/mus/public/interfaces/window_tree.mojom.h" | |
18 #include "services/shell/public/cpp/shell_test.h" | 14 #include "services/shell/public/cpp/shell_test.h" |
| 15 #include "services/ui/public/cpp/window.h" |
| 16 #include "services/ui/public/cpp/window_tree_client.h" |
| 17 #include "services/ui/public/cpp/window_tree_client_delegate.h" |
| 18 #include "services/ui/public/interfaces/window_tree.mojom.h" |
19 | 19 |
20 namespace ash { | 20 namespace ash { |
21 namespace mus { | 21 namespace mus { |
22 | 22 |
23 class WindowTreeClientDelegate : public ::mus::WindowTreeClientDelegate { | 23 class WindowTreeClientDelegate : public ::mus::WindowTreeClientDelegate { |
24 public: | 24 public: |
25 WindowTreeClientDelegate() {} | 25 WindowTreeClientDelegate() {} |
26 ~WindowTreeClientDelegate() override {} | 26 ~WindowTreeClientDelegate() override {} |
27 | 27 |
28 private: | 28 private: |
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
152 ::mus::Window* top_level_window = client->NewTopLevelWindow(nullptr); | 152 ::mus::Window* top_level_window = client->NewTopLevelWindow(nullptr); |
153 ASSERT_TRUE(top_level_window); | 153 ASSERT_TRUE(top_level_window); |
154 | 154 |
155 observer.WaitUntilWindowCountReaches(1u); | 155 observer.WaitUntilWindowCountReaches(1u); |
156 client.reset(); | 156 client.reset(); |
157 observer.WaitUntilWindowCountReaches(0u); | 157 observer.WaitUntilWindowCountReaches(0u); |
158 } | 158 } |
159 | 159 |
160 } // namespace mus | 160 } // namespace mus |
161 } // namespace ash | 161 } // namespace ash |
OLD | NEW |