| 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 "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 | 22 |
| 23 class WindowTreeDelegateImpl : public mus::WindowTreeDelegate { | 23 class WindowTreeDelegateImpl : public mus::WindowTreeDelegate { |
| 24 public: | 24 public: |
| 25 WindowTreeDelegateImpl() {} | 25 WindowTreeDelegateImpl() {} |
| 26 ~WindowTreeDelegateImpl() override {} | 26 ~WindowTreeDelegateImpl() override {} |
| 27 | 27 |
| 28 private: | 28 private: |
| 29 // mus::WindowTreeDelegate: | 29 // mus::WindowTreeDelegate: |
| 30 void OnEmbed(mus::Window* root) override {} | 30 void OnEmbed(mus::Window* root) override {} |
| 31 void OnConnectionLost(mus::WindowTreeConnection* connection) override {} | 31 void OnConnectionLost(mus::WindowTreeConnection* connection) override {} |
| 32 void OnEventObserved(const ui::Event& event) override {} |
| 32 | 33 |
| 33 DISALLOW_COPY_AND_ASSIGN(WindowTreeDelegateImpl); | 34 DISALLOW_COPY_AND_ASSIGN(WindowTreeDelegateImpl); |
| 34 }; | 35 }; |
| 35 | 36 |
| 36 class WindowManagerTest : public shell::test::ShellTest { | 37 class WindowManagerTest : public shell::test::ShellTest { |
| 37 public: | 38 public: |
| 38 WindowManagerTest() : shell::test::ShellTest("exe:mash_unittests") {} | 39 WindowManagerTest() : shell::test::ShellTest("exe:mash_unittests") {} |
| 39 ~WindowManagerTest() override {} | 40 ~WindowManagerTest() override {} |
| 40 | 41 |
| 41 private: | 42 private: |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 150 mus::Window* top_level_window = connection->NewTopLevelWindow(nullptr); | 151 mus::Window* top_level_window = connection->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 connection.reset(); | 155 connection.reset(); |
| 155 observer.WaitUntilWindowCountReaches(0u); | 156 observer.WaitUntilWindowCountReaches(0u); |
| 156 } | 157 } |
| 157 | 158 |
| 158 } // namespace wm | 159 } // namespace wm |
| 159 } // namespace mash | 160 } // namespace mash |
| OLD | NEW |