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

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

Issue 2419723002: Move services/shell to services/service_manager (Closed)
Patch Set: rebase 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/display.cc ('k') | services/ui/ws/gpu_service_proxy.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 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 "services/ui/ws/display_binding.h" 5 #include "services/ui/ws/display_binding.h"
6 6
7 #include "base/memory/ptr_util.h" 7 #include "base/memory/ptr_util.h"
8 #include "services/shell/public/interfaces/connector.mojom.h" 8 #include "services/service_manager/public/interfaces/connector.mojom.h"
9 #include "services/ui/ws/display.h" 9 #include "services/ui/ws/display.h"
10 #include "services/ui/ws/window_manager_access_policy.h" 10 #include "services/ui/ws/window_manager_access_policy.h"
11 #include "services/ui/ws/window_server.h" 11 #include "services/ui/ws/window_server.h"
12 #include "services/ui/ws/window_tree.h" 12 #include "services/ui/ws/window_tree.h"
13 13
14 namespace ui { 14 namespace ui {
15 namespace ws { 15 namespace ws {
16 16
17 DisplayBindingImpl::DisplayBindingImpl(mojom::WindowTreeHostRequest request, 17 DisplayBindingImpl::DisplayBindingImpl(mojom::WindowTreeHostRequest request,
18 Display* display, 18 Display* display,
(...skipping 11 matching lines...) Expand all
30 const uint32_t embed_flags = 0; 30 const uint32_t embed_flags = 0;
31 WindowTree* tree = window_server_->EmbedAtWindow( 31 WindowTree* tree = window_server_->EmbedAtWindow(
32 root, user_id_, std::move(client_), embed_flags, 32 root, user_id_, std::move(client_), embed_flags,
33 base::WrapUnique(new WindowManagerAccessPolicy)); 33 base::WrapUnique(new WindowManagerAccessPolicy));
34 tree->ConfigureWindowManager(); 34 tree->ConfigureWindowManager();
35 return tree; 35 return tree;
36 } 36 }
37 37
38 } // namespace ws 38 } // namespace ws
39 } // namespace ui 39 } // namespace ui
OLDNEW
« no previous file with comments | « services/ui/ws/display.cc ('k') | services/ui/ws/gpu_service_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698