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 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
89 void WindowServerTestBase::OnEmbed(Window* root) { | 89 void WindowServerTestBase::OnEmbed(Window* root) { |
90 most_recent_connection_ = root->connection(); | 90 most_recent_connection_ = root->connection(); |
91 EXPECT_TRUE(QuitRunLoop()); | 91 EXPECT_TRUE(QuitRunLoop()); |
92 host_->AddActivationParent(root->id()); | 92 host_->AddActivationParent(root->id()); |
93 } | 93 } |
94 | 94 |
95 void WindowServerTestBase::OnConnectionLost(WindowTreeConnection* connection) { | 95 void WindowServerTestBase::OnConnectionLost(WindowTreeConnection* connection) { |
96 window_tree_connection_destroyed_ = true; | 96 window_tree_connection_destroyed_ = true; |
97 } | 97 } |
98 | 98 |
| 99 void WindowServerTestBase::SetWindowManagerClient(WindowManagerClient* client) { |
| 100 } |
| 101 |
99 bool WindowServerTestBase::OnWmSetBounds(Window* window, gfx::Rect* bounds) { | 102 bool WindowServerTestBase::OnWmSetBounds(Window* window, gfx::Rect* bounds) { |
100 return window_manager_delegate_ | 103 return window_manager_delegate_ |
101 ? window_manager_delegate_->OnWmSetBounds(window, bounds) | 104 ? window_manager_delegate_->OnWmSetBounds(window, bounds) |
102 : true; | 105 : true; |
103 } | 106 } |
104 | 107 |
105 bool WindowServerTestBase::OnWmSetProperty( | 108 bool WindowServerTestBase::OnWmSetProperty( |
106 Window* window, | 109 Window* window, |
107 const std::string& name, | 110 const std::string& name, |
108 scoped_ptr<std::vector<uint8_t>>* new_data) { | 111 scoped_ptr<std::vector<uint8_t>>* new_data) { |
(...skipping 11 matching lines...) Expand all Loading... |
120 | 123 |
121 void WindowServerTestBase::Create( | 124 void WindowServerTestBase::Create( |
122 mojo::ApplicationConnection* connection, | 125 mojo::ApplicationConnection* connection, |
123 mojo::InterfaceRequest<mojom::WindowTreeClient> request) { | 126 mojo::InterfaceRequest<mojom::WindowTreeClient> request) { |
124 WindowTreeConnection::Create( | 127 WindowTreeConnection::Create( |
125 this, std::move(request), | 128 this, std::move(request), |
126 WindowTreeConnection::CreateType::DONT_WAIT_FOR_EMBED); | 129 WindowTreeConnection::CreateType::DONT_WAIT_FOR_EMBED); |
127 } | 130 } |
128 | 131 |
129 } // namespace mus | 132 } // namespace mus |
OLD | NEW |