| 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 "services/ui/ws/user_display_manager.h" | 5 #include "services/ui/ws/user_display_manager.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "services/ui/display/platform_screen.h" | 9 #include "services/ui/display/platform_screen.h" |
| 10 #include "services/ui/ws/display.h" | 10 #include "services/ui/ws/display.h" |
| 11 #include "services/ui/ws/display_manager.h" | 11 #include "services/ui/ws/display_manager.h" |
| 12 #include "services/ui/ws/user_display_manager_delegate.h" | 12 #include "services/ui/ws/user_display_manager_delegate.h" |
| 13 #include "ui/display/types/display_constants.h" |
| 13 | 14 |
| 14 namespace ui { | 15 namespace ui { |
| 15 namespace ws { | 16 namespace ws { |
| 16 | 17 |
| 17 UserDisplayManager::UserDisplayManager(ws::DisplayManager* display_manager, | 18 UserDisplayManager::UserDisplayManager(ws::DisplayManager* display_manager, |
| 18 UserDisplayManagerDelegate* delegate, | 19 UserDisplayManagerDelegate* delegate, |
| 19 const UserId& user_id) | 20 const UserId& user_id) |
| 20 : display_manager_(display_manager), | 21 : display_manager_(display_manager), |
| 21 delegate_(delegate), | 22 delegate_(delegate), |
| 22 user_id_(user_id), | 23 user_id_(user_id), |
| (...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 | 155 |
| 155 return display_ptrs; | 156 return display_ptrs; |
| 156 } | 157 } |
| 157 | 158 |
| 158 void UserDisplayManager::CallOnDisplays( | 159 void UserDisplayManager::CallOnDisplays( |
| 159 mojom::DisplayManagerObserver* observer) { | 160 mojom::DisplayManagerObserver* observer) { |
| 160 // TODO(kylechar): Pass internal display id to clients here. | 161 // TODO(kylechar): Pass internal display id to clients here. |
| 161 observer->OnDisplays( | 162 observer->OnDisplays( |
| 162 GetAllDisplays().PassStorage(), | 163 GetAllDisplays().PassStorage(), |
| 163 display::PlatformScreen::GetInstance()->GetPrimaryDisplayId(), | 164 display::PlatformScreen::GetInstance()->GetPrimaryDisplayId(), |
| 164 display::Display::kInvalidDisplayID); | 165 display::kInvalidDisplayId); |
| 165 } | 166 } |
| 166 | 167 |
| 167 void UserDisplayManager::AddObserver( | 168 void UserDisplayManager::AddObserver( |
| 168 mojom::DisplayManagerObserverPtr observer) { | 169 mojom::DisplayManagerObserverPtr observer) { |
| 169 mojom::DisplayManagerObserver* observer_impl = observer.get(); | 170 mojom::DisplayManagerObserver* observer_impl = observer.get(); |
| 170 display_manager_observers_.AddPtr(std::move(observer)); | 171 display_manager_observers_.AddPtr(std::move(observer)); |
| 171 OnObserverAdded(observer_impl); | 172 OnObserverAdded(observer_impl); |
| 172 } | 173 } |
| 173 | 174 |
| 174 } // namespace ws | 175 } // namespace ws |
| 175 } // namespace ui | 176 } // namespace ui |
| OLD | NEW |