| OLD | NEW |
| 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 515 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 526 WindowManagerState* WindowServer::GetWindowManagerStateForUser( | 526 WindowManagerState* WindowServer::GetWindowManagerStateForUser( |
| 527 const UserId& user_id) { | 527 const UserId& user_id) { |
| 528 return window_manager_window_tree_factory_set_.GetWindowManagerStateForUser( | 528 return window_manager_window_tree_factory_set_.GetWindowManagerStateForUser( |
| 529 user_id); | 529 user_id); |
| 530 } | 530 } |
| 531 | 531 |
| 532 cc::mojom::DisplayCompositor* WindowServer::GetDisplayCompositor() { | 532 cc::mojom::DisplayCompositor* WindowServer::GetDisplayCompositor() { |
| 533 return display_compositor_.get(); | 533 return display_compositor_.get(); |
| 534 } | 534 } |
| 535 | 535 |
| 536 mojo::AssociatedGroup* WindowServer::GetDisplayCompositorAssociatedGroup() { | |
| 537 return display_compositor_.associated_group(); | |
| 538 } | |
| 539 | |
| 540 bool WindowServer::GetFrameDecorationsForUser( | 536 bool WindowServer::GetFrameDecorationsForUser( |
| 541 const UserId& user_id, | 537 const UserId& user_id, |
| 542 mojom::FrameDecorationValuesPtr* values) { | 538 mojom::FrameDecorationValuesPtr* values) { |
| 543 WindowManagerState* window_manager_state = | 539 WindowManagerState* window_manager_state = |
| 544 window_manager_window_tree_factory_set_.GetWindowManagerStateForUser( | 540 window_manager_window_tree_factory_set_.GetWindowManagerStateForUser( |
| 545 user_id); | 541 user_id); |
| 546 if (!window_manager_state) | 542 if (!window_manager_state) |
| 547 return false; | 543 return false; |
| 548 if (values && window_manager_state->got_frame_decoration_values()) | 544 if (values && window_manager_state->got_frame_decoration_values()) |
| 549 *values = window_manager_state->frame_decoration_values().Clone(); | 545 *values = window_manager_state->frame_decoration_values().Clone(); |
| (...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 812 void WindowServer::OnUserIdAdded(const UserId& id) { | 808 void WindowServer::OnUserIdAdded(const UserId& id) { |
| 813 activity_monitor_map_[id] = base::MakeUnique<UserActivityMonitor>(nullptr); | 809 activity_monitor_map_[id] = base::MakeUnique<UserActivityMonitor>(nullptr); |
| 814 } | 810 } |
| 815 | 811 |
| 816 void WindowServer::OnUserIdRemoved(const UserId& id) { | 812 void WindowServer::OnUserIdRemoved(const UserId& id) { |
| 817 activity_monitor_map_.erase(id); | 813 activity_monitor_map_.erase(id); |
| 818 } | 814 } |
| 819 | 815 |
| 820 } // namespace ws | 816 } // namespace ws |
| 821 } // namespace ui | 817 } // namespace ui |
| OLD | NEW |