| 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 "components/mus/public/cpp/tests/window_server_test_base.h" | 5 #include "components/mus/public/cpp/tests/window_server_test_base.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
| 9 #include "base/run_loop.h" | 9 #include "base/run_loop.h" |
| 10 #include "base/test/test_timeouts.h" | 10 #include "base/test/test_timeouts.h" |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 80 most_recent_connection_ = root->connection(); | 80 most_recent_connection_ = root->connection(); |
| 81 EXPECT_TRUE(QuitRunLoop()); | 81 EXPECT_TRUE(QuitRunLoop()); |
| 82 ASSERT_TRUE(window_manager_client_); | 82 ASSERT_TRUE(window_manager_client_); |
| 83 window_manager_client_->AddActivationParent(root); | 83 window_manager_client_->AddActivationParent(root); |
| 84 } | 84 } |
| 85 | 85 |
| 86 void WindowServerTestBase::OnConnectionLost(WindowTreeConnection* connection) { | 86 void WindowServerTestBase::OnConnectionLost(WindowTreeConnection* connection) { |
| 87 window_tree_connection_destroyed_ = true; | 87 window_tree_connection_destroyed_ = true; |
| 88 } | 88 } |
| 89 | 89 |
| 90 void WindowServerTestBase::OnEventObserved(const ui::Event& event) {} |
| 91 |
| 90 void WindowServerTestBase::SetWindowManagerClient(WindowManagerClient* client) { | 92 void WindowServerTestBase::SetWindowManagerClient(WindowManagerClient* client) { |
| 91 window_manager_client_ = client; | 93 window_manager_client_ = client; |
| 92 } | 94 } |
| 93 | 95 |
| 94 bool WindowServerTestBase::OnWmSetBounds(Window* window, gfx::Rect* bounds) { | 96 bool WindowServerTestBase::OnWmSetBounds(Window* window, gfx::Rect* bounds) { |
| 95 return window_manager_delegate_ | 97 return window_manager_delegate_ |
| 96 ? window_manager_delegate_->OnWmSetBounds(window, bounds) | 98 ? window_manager_delegate_->OnWmSetBounds(window, bounds) |
| 97 : true; | 99 : true; |
| 98 } | 100 } |
| 99 | 101 |
| (...skipping 20 matching lines...) Expand all Loading... |
| 120 | 122 |
| 121 void WindowServerTestBase::Create( | 123 void WindowServerTestBase::Create( |
| 122 shell::Connection* connection, | 124 shell::Connection* connection, |
| 123 mojo::InterfaceRequest<mojom::WindowTreeClient> request) { | 125 mojo::InterfaceRequest<mojom::WindowTreeClient> request) { |
| 124 WindowTreeConnection::Create( | 126 WindowTreeConnection::Create( |
| 125 this, std::move(request), | 127 this, std::move(request), |
| 126 WindowTreeConnection::CreateType::DONT_WAIT_FOR_EMBED); | 128 WindowTreeConnection::CreateType::DONT_WAIT_FOR_EMBED); |
| 127 } | 129 } |
| 128 | 130 |
| 129 } // namespace mus | 131 } // namespace mus |
| OLD | NEW |