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" |
(...skipping 11 matching lines...) Expand all Loading... |
22 | 22 |
23 class WindowTreeClientDelegate : public ui::WindowTreeClientDelegate { | 23 class WindowTreeClientDelegate : public ui::WindowTreeClientDelegate { |
24 public: | 24 public: |
25 WindowTreeClientDelegate() {} | 25 WindowTreeClientDelegate() {} |
26 ~WindowTreeClientDelegate() override {} | 26 ~WindowTreeClientDelegate() override {} |
27 | 27 |
28 private: | 28 private: |
29 // ui::WindowTreeClientDelegate: | 29 // ui::WindowTreeClientDelegate: |
30 void OnEmbed(ui::Window* root) override {} | 30 void OnEmbed(ui::Window* root) override {} |
31 void OnDidDestroyClient(ui::WindowTreeClient* client) override {} | 31 void OnDidDestroyClient(ui::WindowTreeClient* client) override {} |
32 void OnEventObserved(const ui::Event& event, ui::Window* target) override {} | 32 void OnPointerEventObserved(const ui::PointerEvent& event, |
| 33 ui::Window* target) override {} |
33 | 34 |
34 DISALLOW_COPY_AND_ASSIGN(WindowTreeClientDelegate); | 35 DISALLOW_COPY_AND_ASSIGN(WindowTreeClientDelegate); |
35 }; | 36 }; |
36 | 37 |
37 class WindowManagerTest : public shell::test::ServiceTest { | 38 class WindowManagerTest : public shell::test::ServiceTest { |
38 public: | 39 public: |
39 WindowManagerTest() : shell::test::ServiceTest("exe:mash_unittests") {} | 40 WindowManagerTest() : shell::test::ServiceTest("exe:mash_unittests") {} |
40 ~WindowManagerTest() override {} | 41 ~WindowManagerTest() override {} |
41 | 42 |
42 private: | 43 private: |
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
150 ui::Window* top_level_window = client->NewTopLevelWindow(nullptr); | 151 ui::Window* top_level_window = client->NewTopLevelWindow(nullptr); |
151 ASSERT_TRUE(top_level_window); | 152 ASSERT_TRUE(top_level_window); |
152 | 153 |
153 observer.WaitUntilWindowCountReaches(1u); | 154 observer.WaitUntilWindowCountReaches(1u); |
154 client.reset(); | 155 client.reset(); |
155 observer.WaitUntilWindowCountReaches(0u); | 156 observer.WaitUntilWindowCountReaches(0u); |
156 } | 157 } |
157 | 158 |
158 } // namespace mus | 159 } // namespace mus |
159 } // namespace ash | 160 } // namespace ash |
OLD | NEW |