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

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

Issue 2897303002: chromeos: Changes DisplayManagerObserver to have a single function (Closed)
Patch Set: fix compile Created 3 years, 7 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/public/interfaces/display_manager.mojom ('k') | services/ui/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 "services/ui/ws/display.h" 5 #include "services/ui/ws/display.h"
6 6
7 #include <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 // id works. 217 // id works.
218 window_manager_display_root_map_[service_manager::mojom::kRootUserID] = 218 window_manager_display_root_map_[service_manager::mojom::kRootUserID] =
219 display_root_ptr.get(); 219 display_root_ptr.get();
220 WindowTree* window_tree = binding_->CreateWindowTree(display_root->root()); 220 WindowTree* window_tree = binding_->CreateWindowTree(display_root->root());
221 display_root->window_manager_state_ = window_tree->window_manager_state(); 221 display_root->window_manager_state_ = window_tree->window_manager_state();
222 window_tree->window_manager_state()->AddWindowManagerDisplayRoot( 222 window_tree->window_manager_state()->AddWindowManagerDisplayRoot(
223 std::move(display_root_ptr)); 223 std::move(display_root_ptr));
224 } else { 224 } else {
225 CreateWindowManagerDisplayRootsFromFactories(); 225 CreateWindowManagerDisplayRootsFromFactories();
226 } 226 }
227 display_manager()->OnDisplayUpdate(display_); 227 display_manager()->OnDisplayUpdated(display_);
228 } 228 }
229 229
230 void Display::CreateWindowManagerDisplayRootsFromFactories() { 230 void Display::CreateWindowManagerDisplayRootsFromFactories() {
231 std::vector<WindowManagerWindowTreeFactory*> factories = 231 std::vector<WindowManagerWindowTreeFactory*> factories =
232 window_server_->window_manager_window_tree_factory_set()->GetFactories(); 232 window_server_->window_manager_window_tree_factory_set()->GetFactories();
233 for (WindowManagerWindowTreeFactory* factory : factories) { 233 for (WindowManagerWindowTreeFactory* factory : factories) {
234 if (factory->window_tree()) 234 if (factory->window_tree())
235 CreateWindowManagerDisplayRootFromFactory(factory); 235 CreateWindowManagerDisplayRootFromFactory(factory);
236 } 236 }
237 } 237 }
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
407 407
408 UserActivityMonitor* activity_monitor = 408 UserActivityMonitor* activity_monitor =
409 window_server_->GetUserActivityMonitorForUser( 409 window_server_->GetUserActivityMonitorForUser(
410 window_server_->user_id_tracker()->active_id()); 410 window_server_->user_id_tracker()->active_id());
411 activity_monitor->OnUserActivity(); 411 activity_monitor->OnUserActivity();
412 return EventDispatchDetails(); 412 return EventDispatchDetails();
413 } 413 }
414 414
415 } // namespace ws 415 } // namespace ws
416 } // namespace ui 416 } // namespace ui
OLDNEW
« no previous file with comments | « services/ui/public/interfaces/display_manager.mojom ('k') | services/ui/ws/display_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698