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

Side by Side Diff: services/ui/ws/window_manager_window_tree_factory_set.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
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/window_manager_window_tree_factory_set.h" 5 #include "services/ui/ws/window_manager_window_tree_factory_set.h"
6 6
7 #include "services/ui/ws/user_id_tracker_observer.h" 7 #include "services/ui/ws/user_id_tracker_observer.h"
8 #include "services/ui/ws/window_manager_window_tree_factory.h" 8 #include "services/ui/ws/window_manager_window_tree_factory.h"
9 #include "services/ui/ws/window_manager_window_tree_factory_set_observer.h" 9 #include "services/ui/ws/window_manager_window_tree_factory_set_observer.h"
10 #include "services/ui/ws/window_server.h" 10 #include "services/ui/ws/window_server.h"
11 #include "services/ui/ws/window_tree.h" 11 #include "services/ui/ws/window_tree.h"
12 12
13 namespace ui { 13 namespace ui {
14 namespace ws { 14 namespace ws {
15 15
16 WindowManagerWindowTreeFactorySet::WindowManagerWindowTreeFactorySet( 16 WindowManagerWindowTreeFactorySet::WindowManagerWindowTreeFactorySet(
17 WindowServer* window_server, 17 WindowServer* window_server,
18 UserIdTracker* id_tracker) 18 UserIdTracker* id_tracker)
19 : id_tracker_(id_tracker), window_server_(window_server) { 19 : id_tracker_(id_tracker), window_server_(window_server) {
20 id_tracker_->AddObserver(this); 20 id_tracker_->AddObserver(this);
21 } 21 }
22 22
23 WindowManagerWindowTreeFactorySet::~WindowManagerWindowTreeFactorySet() { 23 WindowManagerWindowTreeFactorySet::~WindowManagerWindowTreeFactorySet() {
24 id_tracker_->RemoveObserver(this); 24 id_tracker_->RemoveObserver(this);
25 } 25 }
26 26
27 WindowManagerWindowTreeFactory* WindowManagerWindowTreeFactorySet::Add( 27 WindowManagerWindowTreeFactory* WindowManagerWindowTreeFactorySet::Add(
28 const UserId& user_id, 28 const UserId& user_id,
29 const std::string& client_name,
29 mojo::InterfaceRequest<mojom::WindowManagerWindowTreeFactory> request) { 30 mojo::InterfaceRequest<mojom::WindowManagerWindowTreeFactory> request) {
30 if (factories_.count(user_id)) { 31 if (factories_.count(user_id)) {
31 DVLOG(1) << "can only have one factory per user"; 32 DVLOG(1) << "can only have one factory per user";
32 return nullptr; 33 return nullptr;
33 } 34 }
34 35
35 std::unique_ptr<WindowManagerWindowTreeFactory> factory_ptr( 36 std::unique_ptr<WindowManagerWindowTreeFactory> factory_ptr(
36 new WindowManagerWindowTreeFactory(this, user_id, std::move(request))); 37 new WindowManagerWindowTreeFactory(this, user_id, client_name,
38 std::move(request)));
37 WindowManagerWindowTreeFactory* factory = factory_ptr.get(); 39 WindowManagerWindowTreeFactory* factory = factory_ptr.get();
38 factories_[user_id] = std::move(factory_ptr); 40 factories_[user_id] = std::move(factory_ptr);
39 return factory; 41 return factory;
40 } 42 }
41 43
42 WindowManagerState* 44 WindowManagerState*
43 WindowManagerWindowTreeFactorySet::GetWindowManagerStateForUser( 45 WindowManagerWindowTreeFactorySet::GetWindowManagerStateForUser(
44 const UserId& user_id) { 46 const UserId& user_id) {
45 auto it = factories_.find(user_id); 47 auto it = factories_.find(user_id);
46 if (it == factories_.end()) 48 if (it == factories_.end())
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 if (is_first_valid_factory) 92 if (is_first_valid_factory)
91 window_server_->OnFirstWindowManagerWindowTreeFactoryReady(); 93 window_server_->OnFirstWindowManagerWindowTreeFactoryReady();
92 } 94 }
93 95
94 void WindowManagerWindowTreeFactorySet::OnUserIdRemoved(const UserId& id) { 96 void WindowManagerWindowTreeFactorySet::OnUserIdRemoved(const UserId& id) {
95 factories_.erase(id); 97 factories_.erase(id);
96 } 98 }
97 99
98 } // namespace ws 100 } // namespace ws
99 } // namespace ui 101 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698