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

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

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

Powered by Google App Engine
This is Rietveld 408576698