Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(74)

Side by Side Diff: services/ui/ws/test_utils.cc

Issue 2419063003: Move services/shell to services/service_manager (Closed)
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « services/ui/ws/platform_display.cc ('k') | services/ui/ws/user_id_tracker.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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"
11 #include "gpu/ipc/client/gpu_channel_host.h" 11 #include "gpu/ipc/client/gpu_channel_host.h"
12 #include "services/shell/public/interfaces/connector.mojom.h" 12 #include "services/service_manager/public/interfaces/connector.mojom.h"
13 #include "services/ui/public/interfaces/cursor.mojom.h" 13 #include "services/ui/public/interfaces/cursor.mojom.h"
14 #include "services/ui/surfaces/display_compositor.h" 14 #include "services/ui/surfaces/display_compositor.h"
15 #include "services/ui/ws/display_binding.h" 15 #include "services/ui/ws/display_binding.h"
16 #include "services/ui/ws/display_manager.h" 16 #include "services/ui/ws/display_manager.h"
17 #include "services/ui/ws/platform_display_init_params.h" 17 #include "services/ui/ws/platform_display_init_params.h"
18 #include "services/ui/ws/server_window_surface_manager_test_api.h" 18 #include "services/ui/ws/server_window_surface_manager_test_api.h"
19 #include "services/ui/ws/window_manager_access_policy.h" 19 #include "services/ui/ws/window_manager_access_policy.h"
20 #include "services/ui/ws/window_manager_window_tree_factory.h" 20 #include "services/ui/ws/window_manager_window_tree_factory.h"
21 #include "testing/gtest/include/gtest/gtest.h" 21 #include "testing/gtest/include/gtest/gtest.h"
22 22
(...skipping 584 matching lines...) Expand 10 before | Expand all | Expand 10 after
607 return nullptr; 607 return nullptr;
608 if (!tree->AddWindow(parent_client_id, client_window_id)) 608 if (!tree->AddWindow(parent_client_id, client_window_id))
609 return nullptr; 609 return nullptr;
610 *client_id = client_window_id; 610 *client_id = client_window_id;
611 return tree->GetWindowByClientId(client_window_id); 611 return tree->GetWindowByClientId(client_window_id);
612 } 612 }
613 613
614 } // namespace test 614 } // namespace test
615 } // namespace ws 615 } // namespace ws
616 } // namespace ui 616 } // namespace ui
OLDNEW
« no previous file with comments | « services/ui/ws/platform_display.cc ('k') | services/ui/ws/user_id_tracker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698