| OLD | NEW |
| 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 266 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 277 InitWindowManagerDisplayRoots(); | 277 InitWindowManagerDisplayRoots(); |
| 278 } | 278 } |
| 279 | 279 |
| 280 bool Display::IsInHighContrastMode() { | 280 bool Display::IsInHighContrastMode() { |
| 281 return window_server_->IsActiveUserInHighContrastMode(); | 281 return window_server_->IsActiveUserInHighContrastMode(); |
| 282 } | 282 } |
| 283 | 283 |
| 284 void Display::OnEvent(const ui::Event& event) { | 284 void Display::OnEvent(const ui::Event& event) { |
| 285 WindowManagerDisplayRoot* display_root = GetActiveWindowManagerDisplayRoot(); | 285 WindowManagerDisplayRoot* display_root = GetActiveWindowManagerDisplayRoot(); |
| 286 if (display_root) | 286 if (display_root) |
| 287 display_root->window_manager_state()->ProcessEvent(event); | 287 display_root->window_manager_state()->ProcessEvent(event, GetId()); |
| 288 window_server_ | 288 window_server_ |
| 289 ->GetUserActivityMonitorForUser( | 289 ->GetUserActivityMonitorForUser( |
| 290 window_server_->user_id_tracker()->active_id()) | 290 window_server_->user_id_tracker()->active_id()) |
| 291 ->OnUserActivity(); | 291 ->OnUserActivity(); |
| 292 } | 292 } |
| 293 | 293 |
| 294 void Display::OnNativeCaptureLost() { | 294 void Display::OnNativeCaptureLost() { |
| 295 WindowManagerDisplayRoot* display_root = GetActiveWindowManagerDisplayRoot(); | 295 WindowManagerDisplayRoot* display_root = GetActiveWindowManagerDisplayRoot(); |
| 296 if (display_root) | 296 if (display_root) |
| 297 display_root->window_manager_state()->SetCapture(nullptr, kInvalidClientId); | 297 display_root->window_manager_state()->SetCapture(nullptr, kInvalidClientId); |
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 393 } | 393 } |
| 394 | 394 |
| 395 void Display::OnWindowManagerWindowTreeFactoryReady( | 395 void Display::OnWindowManagerWindowTreeFactoryReady( |
| 396 WindowManagerWindowTreeFactory* factory) { | 396 WindowManagerWindowTreeFactory* factory) { |
| 397 if (!binding_) | 397 if (!binding_) |
| 398 CreateWindowManagerDisplayRootFromFactory(factory); | 398 CreateWindowManagerDisplayRootFromFactory(factory); |
| 399 } | 399 } |
| 400 | 400 |
| 401 } // namespace ws | 401 } // namespace ws |
| 402 } // namespace ui | 402 } // namespace ui |
| OLD | NEW |