| 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 SERVICES_UI_WS_WINDOW_SERVER_TEST_BASE_H_ | 5 #ifndef SERVICES_UI_WS_WINDOW_SERVER_TEST_BASE_H_ |
| 6 #define SERVICES_UI_WS_WINDOW_SERVER_TEST_BASE_H_ | 6 #define SERVICES_UI_WS_WINDOW_SERVER_TEST_BASE_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 #include <set> | 9 #include <set> |
| 10 | 10 |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 // Returns the most recent WindowTreeClient that was created as the result of | 68 // Returns the most recent WindowTreeClient that was created as the result of |
| 69 // InterfaceFactory<WindowTreeClient> being called. In other words the most | 69 // InterfaceFactory<WindowTreeClient> being called. In other words the most |
| 70 // recent WindowTreeClient created as the result of a client embedding. | 70 // recent WindowTreeClient created as the result of a client embedding. |
| 71 std::unique_ptr<aura::WindowTreeClient> ReleaseMostRecentClient(); | 71 std::unique_ptr<aura::WindowTreeClient> ReleaseMostRecentClient(); |
| 72 | 72 |
| 73 // testing::Test: | 73 // testing::Test: |
| 74 void SetUp() override; | 74 void SetUp() override; |
| 75 void TearDown() override; | 75 void TearDown() override; |
| 76 | 76 |
| 77 // WindowServerServiceTestBase: | 77 // WindowServerServiceTestBase: |
| 78 void OnBindInterface(const service_manager::ServiceInfo& source_info, | 78 void OnBindInterface(const service_manager::BindSourceInfo& source_info, |
| 79 const std::string& interface_name, | 79 const std::string& interface_name, |
| 80 mojo::ScopedMessagePipeHandle interface_pipe) override; | 80 mojo::ScopedMessagePipeHandle interface_pipe) override; |
| 81 | 81 |
| 82 // WindowTreeClientDelegate: | 82 // WindowTreeClientDelegate: |
| 83 void OnEmbed( | 83 void OnEmbed( |
| 84 std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) override; | 84 std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) override; |
| 85 void OnLostConnection(aura::WindowTreeClient* client) override; | 85 void OnLostConnection(aura::WindowTreeClient* client) override; |
| 86 void OnEmbedRootDestroyed(aura::WindowTreeHostMus* window_tree_host) override; | 86 void OnEmbedRootDestroyed(aura::WindowTreeHostMus* window_tree_host) override; |
| 87 void OnPointerEventObserved(const ui::PointerEvent& event, | 87 void OnPointerEventObserved(const ui::PointerEvent& event, |
| 88 aura::Window* target) override; | 88 aura::Window* target) override; |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 163 bool window_tree_client_lost_connection_ = false; | 163 bool window_tree_client_lost_connection_ = false; |
| 164 | 164 |
| 165 service_manager::BinderRegistry registry_; | 165 service_manager::BinderRegistry registry_; |
| 166 | 166 |
| 167 DISALLOW_COPY_AND_ASSIGN(WindowServerTestBase); | 167 DISALLOW_COPY_AND_ASSIGN(WindowServerTestBase); |
| 168 }; | 168 }; |
| 169 | 169 |
| 170 } // namespace ui | 170 } // namespace ui |
| 171 | 171 |
| 172 #endif // SERVICES_UI_WS_WINDOW_SERVER_TEST_BASE_H_ | 172 #endif // SERVICES_UI_WS_WINDOW_SERVER_TEST_BASE_H_ |
| OLD | NEW |