OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "services/ui/ws/test_utils.h" | 5 #include "services/ui/ws/test_utils.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/memory/ptr_util.h" | 9 #include "base/memory/ptr_util.h" |
10 #include "cc/output/copy_output_request.h" | 10 #include "cc/output/copy_output_request.h" |
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
184 if (pair.second.window == window) | 184 if (pair.second.window == window) |
185 count++; | 185 count++; |
186 return count; | 186 return count; |
187 } | 187 } |
188 | 188 |
189 // TestDisplayBinding --------------------------------------------------------- | 189 // TestDisplayBinding --------------------------------------------------------- |
190 | 190 |
191 WindowTree* TestDisplayBinding::CreateWindowTree(ServerWindow* root) { | 191 WindowTree* TestDisplayBinding::CreateWindowTree(ServerWindow* root) { |
192 const uint32_t embed_flags = 0; | 192 const uint32_t embed_flags = 0; |
193 WindowTree* tree = window_server_->EmbedAtWindow( | 193 WindowTree* tree = window_server_->EmbedAtWindow( |
194 root, shell::mojom::kRootUserID, ui::mojom::WindowTreeClientPtr(), | 194 root, service_manager::mojom::kRootUserID, |
195 embed_flags, base::WrapUnique(new WindowManagerAccessPolicy)); | 195 ui::mojom::WindowTreeClientPtr(), embed_flags, |
| 196 base::WrapUnique(new WindowManagerAccessPolicy)); |
196 tree->ConfigureWindowManager(); | 197 tree->ConfigureWindowManager(); |
197 return tree; | 198 return tree; |
198 } | 199 } |
199 | 200 |
200 // TestWindowManager ---------------------------------------------------------- | 201 // TestWindowManager ---------------------------------------------------------- |
201 | 202 |
202 void TestWindowManager::WmDisplayRemoved(int64_t display_id) { | 203 void TestWindowManager::WmDisplayRemoved(int64_t display_id) { |
203 got_display_removed_ = true; | 204 got_display_removed_ = true; |
204 display_removed_id_ = display_id; | 205 display_removed_id_ = display_id; |
205 } | 206 } |
(...skipping 401 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
607 return nullptr; | 608 return nullptr; |
608 if (!tree->AddWindow(parent_client_id, client_window_id)) | 609 if (!tree->AddWindow(parent_client_id, client_window_id)) |
609 return nullptr; | 610 return nullptr; |
610 *client_id = client_window_id; | 611 *client_id = client_window_id; |
611 return tree->GetWindowByClientId(client_window_id); | 612 return tree->GetWindowByClientId(client_window_id); |
612 } | 613 } |
613 | 614 |
614 } // namespace test | 615 } // namespace test |
615 } // namespace ws | 616 } // namespace ws |
616 } // namespace ui | 617 } // namespace ui |
OLD | NEW |