| OLD | NEW |
| 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 "components/mus/ws/display_manager.h" | 5 #include "services/ui/ws/display_manager.h" |
| 6 | 6 |
| 7 #include "base/memory/ptr_util.h" | 7 #include "base/memory/ptr_util.h" |
| 8 #include "components/mus/ws/display.h" | 8 #include "services/ui/ws/display.h" |
| 9 #include "components/mus/ws/display_manager_delegate.h" | 9 #include "services/ui/ws/display_manager_delegate.h" |
| 10 #include "components/mus/ws/event_dispatcher.h" | 10 #include "services/ui/ws/event_dispatcher.h" |
| 11 #include "components/mus/ws/server_window.h" | 11 #include "services/ui/ws/server_window.h" |
| 12 #include "components/mus/ws/user_display_manager.h" | 12 #include "services/ui/ws/user_display_manager.h" |
| 13 #include "components/mus/ws/user_id_tracker.h" | 13 #include "services/ui/ws/user_id_tracker.h" |
| 14 #include "components/mus/ws/window_manager_state.h" | 14 #include "services/ui/ws/window_manager_state.h" |
| 15 | 15 |
| 16 namespace mus { | 16 namespace mus { |
| 17 namespace ws { | 17 namespace ws { |
| 18 | 18 |
| 19 DisplayManager::DisplayManager(DisplayManagerDelegate* delegate, | 19 DisplayManager::DisplayManager(DisplayManagerDelegate* delegate, |
| 20 UserIdTracker* user_id_tracker) | 20 UserIdTracker* user_id_tracker) |
| 21 // |next_root_id_| is used as the lower bits, so that starting at 0 is | 21 // |next_root_id_| is used as the lower bits, so that starting at 0 is |
| 22 // fine. |next_display_id_| is used by itself, so we start at 1 to reserve | 22 // fine. |next_display_id_| is used by itself, so we start at 1 to reserve |
| 23 // 0 as invalid. | 23 // 0 as invalid. |
| 24 : delegate_(delegate), | 24 : delegate_(delegate), |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 158 } | 158 } |
| 159 | 159 |
| 160 WindowManagerState* current_window_manager_state = | 160 WindowManagerState* current_window_manager_state = |
| 161 delegate_->GetWindowManagerStateForUser(active_id); | 161 delegate_->GetWindowManagerStateForUser(active_id); |
| 162 if (current_window_manager_state) | 162 if (current_window_manager_state) |
| 163 current_window_manager_state->Activate(mouse_location_on_screen); | 163 current_window_manager_state->Activate(mouse_location_on_screen); |
| 164 } | 164 } |
| 165 | 165 |
| 166 } // namespace ws | 166 } // namespace ws |
| 167 } // namespace mus | 167 } // namespace mus |
| OLD | NEW |