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

Side by Side Diff: components/mus/ws/display_binding.cc

Issue 1782123003: Makes WindowTree take the AccessPolicy (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 4 years, 9 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
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 "components/mus/ws/display_binding.h" 5 #include "components/mus/ws/display_binding.h"
6 6
7 #include "components/mus/ws/connection_manager.h" 7 #include "components/mus/ws/connection_manager.h"
8 #include "components/mus/ws/display.h" 8 #include "components/mus/ws/display.h"
9 #include "components/mus/ws/window_manager_access_policy.h"
9 #include "components/mus/ws/window_tree.h" 10 #include "components/mus/ws/window_tree.h"
10 #include "mojo/shell/public/interfaces/connector.mojom.h" 11 #include "mojo/shell/public/interfaces/connector.mojom.h"
11 12
12 namespace mus { 13 namespace mus {
13 namespace ws { 14 namespace ws {
14 15
15 DisplayBindingImpl::DisplayBindingImpl(mojom::WindowTreeHostRequest request, 16 DisplayBindingImpl::DisplayBindingImpl(mojom::WindowTreeHostRequest request,
16 Display* display, 17 Display* display,
17 const UserId& user_id, 18 const UserId& user_id,
18 mojom::WindowTreeClientPtr client, 19 mojom::WindowTreeClientPtr client,
19 ConnectionManager* manager) 20 ConnectionManager* manager)
20 : connection_manager_(manager), 21 : connection_manager_(manager),
21 user_id_(user_id), 22 user_id_(user_id),
22 binding_(display, std::move(request)), 23 binding_(display, std::move(request)),
23 client_(std::move(client)) {} 24 client_(std::move(client)) {}
24 25
25 DisplayBindingImpl::~DisplayBindingImpl() {} 26 DisplayBindingImpl::~DisplayBindingImpl() {}
26 27
27 WindowTree* DisplayBindingImpl::CreateWindowTree(ServerWindow* root) { 28 WindowTree* DisplayBindingImpl::CreateWindowTree(ServerWindow* root) {
28 WindowTree* tree = 29 WindowTree* tree = connection_manager_->EmbedAtWindow(
29 connection_manager_->EmbedAtWindow(root, user_id_, std::move(client_)); 30 root, user_id_, std::move(client_),
31 make_scoped_ptr(new WindowManagerAccessPolicy));
30 tree->ConfigureWindowManager(); 32 tree->ConfigureWindowManager();
31 return tree; 33 return tree;
32 } 34 }
33 35
34 } // namespace ws 36 } // namespace ws
35 } // namespace mus 37 } // namespace mus
OLDNEW
« no previous file with comments | « components/mus/ws/default_access_policy.cc ('k') | components/mus/ws/window_manager_access_policy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698