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 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
195 return; | 195 return; |
196 } | 196 } |
197 } | 197 } |
198 NOTREACHED(); | 198 NOTREACHED(); |
199 } | 199 } |
200 | 200 |
201 void Display::SetNativeCursor(const ui::CursorData& cursor) { | 201 void Display::SetNativeCursor(const ui::CursorData& cursor) { |
202 platform_display_->SetCursor(cursor); | 202 platform_display_->SetCursor(cursor); |
203 } | 203 } |
204 | 204 |
| 205 void Display::SetNativeCursorSize(ui::CursorSize cursor_size) { |
| 206 platform_display_->SetCursorSize(cursor_size); |
| 207 } |
| 208 |
205 void Display::SetSize(const gfx::Size& size) { | 209 void Display::SetSize(const gfx::Size& size) { |
206 platform_display_->SetViewportSize(size); | 210 platform_display_->SetViewportSize(size); |
207 } | 211 } |
208 | 212 |
209 void Display::SetTitle(const std::string& title) { | 213 void Display::SetTitle(const std::string& title) { |
210 platform_display_->SetTitle(base::UTF8ToUTF16(title)); | 214 platform_display_->SetTitle(base::UTF8ToUTF16(title)); |
211 } | 215 } |
212 | 216 |
213 void Display::InitWindowManagerDisplayRoots() { | 217 void Display::InitWindowManagerDisplayRoots() { |
214 if (binding_) { | 218 if (binding_) { |
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
413 | 417 |
414 UserActivityMonitor* activity_monitor = | 418 UserActivityMonitor* activity_monitor = |
415 window_server_->GetUserActivityMonitorForUser( | 419 window_server_->GetUserActivityMonitorForUser( |
416 window_server_->user_id_tracker()->active_id()); | 420 window_server_->user_id_tracker()->active_id()); |
417 activity_monitor->OnUserActivity(); | 421 activity_monitor->OnUserActivity(); |
418 return EventDispatchDetails(); | 422 return EventDispatchDetails(); |
419 } | 423 } |
420 | 424 |
421 } // namespace ws | 425 } // namespace ws |
422 } // namespace ui | 426 } // namespace ui |
OLD | NEW |