| 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 "base/memory/ptr_util.h" | 7 #include "base/memory/ptr_util.h" |
| 8 #include "cc/output/copy_output_request.h" | 8 #include "cc/output/copy_output_request.h" |
| 9 #include "services/shell/public/interfaces/connector.mojom.h" | 9 #include "services/shell/public/interfaces/connector.mojom.h" |
| 10 #include "services/ui/surfaces/surfaces_state.h" | 10 #include "services/ui/surfaces/surfaces_state.h" |
| 11 #include "services/ui/ws/display_binding.h" | 11 #include "services/ui/ws/display_binding.h" |
| 12 #include "services/ui/ws/display_manager.h" | 12 #include "services/ui/ws/display_manager.h" |
| 13 #include "services/ui/ws/platform_display_init_params.h" |
| 13 #include "services/ui/ws/server_window_surface_manager_test_api.h" | 14 #include "services/ui/ws/server_window_surface_manager_test_api.h" |
| 14 #include "services/ui/ws/window_manager_access_policy.h" | 15 #include "services/ui/ws/window_manager_access_policy.h" |
| 15 #include "services/ui/ws/window_manager_window_tree_factory.h" | 16 #include "services/ui/ws/window_manager_window_tree_factory.h" |
| 16 #include "testing/gtest/include/gtest/gtest.h" | 17 #include "testing/gtest/include/gtest/gtest.h" |
| 17 | 18 |
| 18 namespace ui { | 19 namespace ui { |
| 19 namespace ws { | 20 namespace ws { |
| 20 namespace test { | 21 namespace test { |
| 21 namespace { | 22 namespace { |
| 22 | 23 |
| (...skipping 464 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 487 return nullptr; | 488 return nullptr; |
| 488 if (!tree->AddWindow(parent_client_id, client_window_id)) | 489 if (!tree->AddWindow(parent_client_id, client_window_id)) |
| 489 return nullptr; | 490 return nullptr; |
| 490 *client_id = client_window_id; | 491 *client_id = client_window_id; |
| 491 return tree->GetWindowByClientId(client_window_id); | 492 return tree->GetWindowByClientId(client_window_id); |
| 492 } | 493 } |
| 493 | 494 |
| 494 } // namespace test | 495 } // namespace test |
| 495 } // namespace ws | 496 } // namespace ws |
| 496 } // namespace ui | 497 } // namespace ui |
| OLD | NEW |