| 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 <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/memory/ptr_util.h" | 9 #include "base/memory/ptr_util.h" |
| 10 #include "gpu/ipc/client/gpu_channel_host.h" | 10 #include "gpu/ipc/client/gpu_channel_host.h" |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 132 if (cursor_data.cursor_type() == ui::CursorType::kCustom) { | 132 if (cursor_data.cursor_type() == ui::CursorType::kCustom) { |
| 133 NOTIMPLEMENTED() << "No custom cursor support on non-ozone yet."; | 133 NOTIMPLEMENTED() << "No custom cursor support on non-ozone yet."; |
| 134 native_cursor = ui::Cursor(ui::CursorType::kPointer); | 134 native_cursor = ui::Cursor(ui::CursorType::kPointer); |
| 135 } | 135 } |
| 136 image_cursors_->SetPlatformCursor(&native_cursor); | 136 image_cursors_->SetPlatformCursor(&native_cursor); |
| 137 #endif | 137 #endif |
| 138 | 138 |
| 139 platform_window_->SetCursor(native_cursor.platform()); | 139 platform_window_->SetCursor(native_cursor.platform()); |
| 140 } | 140 } |
| 141 | 141 |
| 142 void PlatformDisplayDefault::MoveCursorTo( |
| 143 const gfx::Point& window_pixel_location) { |
| 144 platform_window_->MoveCursorTo(window_pixel_location); |
| 145 } |
| 146 |
| 142 void PlatformDisplayDefault::UpdateTextInputState( | 147 void PlatformDisplayDefault::UpdateTextInputState( |
| 143 const ui::TextInputState& state) { | 148 const ui::TextInputState& state) { |
| 144 ui::PlatformImeController* ime = platform_window_->GetPlatformImeController(); | 149 ui::PlatformImeController* ime = platform_window_->GetPlatformImeController(); |
| 145 if (ime) | 150 if (ime) |
| 146 ime->UpdateTextInputState(state); | 151 ime->UpdateTextInputState(state); |
| 147 } | 152 } |
| 148 | 153 |
| 149 void PlatformDisplayDefault::SetImeVisibility(bool visible) { | 154 void PlatformDisplayDefault::SetImeVisibility(bool visible) { |
| 150 ui::PlatformImeController* ime = platform_window_->GetPlatformImeController(); | 155 ui::PlatformImeController* ime = platform_window_->GetPlatformImeController(); |
| 151 if (ime) | 156 if (ime) |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 264 } | 269 } |
| 265 | 270 |
| 266 void PlatformDisplayDefault::OnAcceleratedWidgetDestroyed() { | 271 void PlatformDisplayDefault::OnAcceleratedWidgetDestroyed() { |
| 267 NOTREACHED(); | 272 NOTREACHED(); |
| 268 } | 273 } |
| 269 | 274 |
| 270 void PlatformDisplayDefault::OnActivationChanged(bool active) {} | 275 void PlatformDisplayDefault::OnActivationChanged(bool active) {} |
| 271 | 276 |
| 272 } // namespace ws | 277 } // namespace ws |
| 273 } // namespace ui | 278 } // namespace ui |
| OLD | NEW |