| 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/platform_display_default.h" | 5 #include "services/ui/ws/platform_display_default.h" |
| 6 | 6 |
| 7 #include "base/memory/ptr_util.h" | 7 #include "base/memory/ptr_util.h" |
| 8 #include "gpu/ipc/client/gpu_channel_host.h" | 8 #include "gpu/ipc/client/gpu_channel_host.h" |
| 9 #include "services/ui/display/screen_manager.h" | 9 #include "services/ui/display/screen_manager.h" |
| 10 #include "services/ui/ws/display_client_compositor_frame_sink.h" | 10 #include "services/ui/ws/display_client_compositor_frame_sink.h" |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 91 } | 91 } |
| 92 | 92 |
| 93 void PlatformDisplayDefault::SetCapture() { | 93 void PlatformDisplayDefault::SetCapture() { |
| 94 platform_window_->SetCapture(); | 94 platform_window_->SetCapture(); |
| 95 } | 95 } |
| 96 | 96 |
| 97 void PlatformDisplayDefault::ReleaseCapture() { | 97 void PlatformDisplayDefault::ReleaseCapture() { |
| 98 platform_window_->ReleaseCapture(); | 98 platform_window_->ReleaseCapture(); |
| 99 } | 99 } |
| 100 | 100 |
| 101 void PlatformDisplayDefault::SetCursorById(mojom::Cursor cursor_id) { | 101 void PlatformDisplayDefault::SetCursorById(mojom::CursorType cursor_id) { |
| 102 #if !defined(OS_ANDROID) | 102 #if !defined(OS_ANDROID) |
| 103 // TODO(erg): This still isn't sufficient, and will only use native cursors | 103 // TODO(erg): This still isn't sufficient, and will only use native cursors |
| 104 // that chrome would use, not custom image cursors. For that, we should | 104 // that chrome would use, not custom image cursors. For that, we should |
| 105 // delegate to the window manager to load images from resource packs. | 105 // delegate to the window manager to load images from resource packs. |
| 106 // | 106 // |
| 107 // We probably also need to deal with different DPIs. | 107 // We probably also need to deal with different DPIs. |
| 108 ui::Cursor cursor(static_cast<int32_t>(cursor_id)); | 108 ui::Cursor cursor(static_cast<int32_t>(cursor_id)); |
| 109 image_cursors_->SetPlatformCursor(&cursor); | 109 image_cursors_->SetPlatformCursor(&cursor); |
| 110 platform_window_->SetCursor(cursor.platform()); | 110 platform_window_->SetCursor(cursor.platform()); |
| 111 #endif | 111 #endif |
| (...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 271 } | 271 } |
| 272 | 272 |
| 273 void PlatformDisplayDefault::OnAcceleratedWidgetDestroyed() { | 273 void PlatformDisplayDefault::OnAcceleratedWidgetDestroyed() { |
| 274 NOTREACHED(); | 274 NOTREACHED(); |
| 275 } | 275 } |
| 276 | 276 |
| 277 void PlatformDisplayDefault::OnActivationChanged(bool active) {} | 277 void PlatformDisplayDefault::OnActivationChanged(bool active) {} |
| 278 | 278 |
| 279 } // namespace ws | 279 } // namespace ws |
| 280 } // namespace ui | 280 } // namespace ui |
| OLD | NEW |