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

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

Issue 2306003002: Set name for WindowTree of WindowManager (Closed)
Patch Set: Set name for WindowTree of WindowManager Created 4 years, 3 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
« services/ui/service.cc ('K') | « services/ui/ws/window_server.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/window_server.h" 5 #include "services/ui/ws/window_server.h"
6 6
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 std::unique_ptr<WindowTreeBinding> binding, 112 std::unique_ptr<WindowTreeBinding> binding,
113 mojom::WindowTreePtr tree_ptr) { 113 mojom::WindowTreePtr tree_ptr) {
114 CHECK_EQ(0u, tree_map_.count(tree_impl_ptr->id())); 114 CHECK_EQ(0u, tree_map_.count(tree_impl_ptr->id()));
115 WindowTree* tree = tree_impl_ptr.get(); 115 WindowTree* tree = tree_impl_ptr.get();
116 tree_map_[tree->id()] = std::move(tree_impl_ptr); 116 tree_map_[tree->id()] = std::move(tree_impl_ptr);
117 tree->Init(std::move(binding), std::move(tree_ptr)); 117 tree->Init(std::move(binding), std::move(tree_ptr));
118 } 118 }
119 119
120 WindowTree* WindowServer::CreateTreeForWindowManager( 120 WindowTree* WindowServer::CreateTreeForWindowManager(
121 const UserId& user_id, 121 const UserId& user_id,
122 const std::string& client_name,
122 mojom::WindowTreeRequest window_tree_request, 123 mojom::WindowTreeRequest window_tree_request,
123 mojom::WindowTreeClientPtr window_tree_client) { 124 mojom::WindowTreeClientPtr window_tree_client) {
124 std::unique_ptr<WindowTree> window_tree(new WindowTree( 125 std::unique_ptr<WindowTree> window_tree(new WindowTree(
125 this, user_id, nullptr, base::WrapUnique(new WindowManagerAccessPolicy))); 126 this, user_id, nullptr, base::WrapUnique(new WindowManagerAccessPolicy)));
126 std::unique_ptr<WindowTreeBinding> window_tree_binding = 127 std::unique_ptr<WindowTreeBinding> window_tree_binding =
127 delegate_->CreateWindowTreeBinding( 128 delegate_->CreateWindowTreeBinding(
128 WindowServerDelegate::BindingType::WINDOW_MANAGER, this, 129 WindowServerDelegate::BindingType::WINDOW_MANAGER, this,
129 window_tree.get(), &window_tree_request, &window_tree_client); 130 window_tree.get(), &window_tree_request, &window_tree_client);
130 if (!window_tree_binding) { 131 if (!window_tree_binding) {
131 window_tree_binding.reset(new DefaultWindowTreeBinding( 132 window_tree_binding.reset(new DefaultWindowTreeBinding(
132 window_tree.get(), this, std::move(window_tree_request), 133 window_tree.get(), this, std::move(window_tree_request),
133 std::move(window_tree_client))); 134 std::move(window_tree_client)));
134 } 135 }
135 WindowTree* window_tree_ptr = window_tree.get(); 136 WindowTree* window_tree_ptr = window_tree.get();
137 window_tree->set_name(client_name);
136 AddTree(std::move(window_tree), std::move(window_tree_binding), nullptr); 138 AddTree(std::move(window_tree), std::move(window_tree_binding), nullptr);
137 window_tree_ptr->ConfigureWindowManager(); 139 window_tree_ptr->ConfigureWindowManager();
138 return window_tree_ptr; 140 return window_tree_ptr;
139 } 141 }
140 142
141 void WindowServer::DestroyTree(WindowTree* tree) { 143 void WindowServer::DestroyTree(WindowTree* tree) {
142 std::unique_ptr<WindowTree> tree_ptr; 144 std::unique_ptr<WindowTree> tree_ptr;
143 { 145 {
144 auto iter = tree_map_.find(tree->id()); 146 auto iter = tree_map_.find(tree->id());
145 DCHECK(iter != tree_map_.end()); 147 DCHECK(iter != tree_map_.end());
(...skipping 635 matching lines...) Expand 10 before | Expand all | Expand 10 after
781 clipboard_map_[id] = base::MakeUnique<clipboard::ClipboardImpl>(); 783 clipboard_map_[id] = base::MakeUnique<clipboard::ClipboardImpl>();
782 } 784 }
783 785
784 void WindowServer::OnUserIdRemoved(const UserId& id) { 786 void WindowServer::OnUserIdRemoved(const UserId& id) {
785 activity_monitor_map_.erase(id); 787 activity_monitor_map_.erase(id);
786 clipboard_map_.erase(id); 788 clipboard_map_.erase(id);
787 } 789 }
788 790
789 } // namespace ws 791 } // namespace ws
790 } // namespace ui 792 } // namespace ui
OLDNEW
« services/ui/service.cc ('K') | « services/ui/ws/window_server.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698