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 "gpu/ipc/client/gpu_channel_host.h" | 7 #include "gpu/ipc/client/gpu_channel_host.h" |
8 #include "services/ui/display/platform_screen.h" | 8 #include "services/ui/display/screen_manager.h" |
9 #include "services/ui/ws/platform_display_init_params.h" | 9 #include "services/ui/ws/platform_display_init_params.h" |
10 #include "services/ui/ws/server_window.h" | 10 #include "services/ui/ws/server_window.h" |
11 #include "ui/base/cursor/cursor_loader.h" | 11 #include "ui/base/cursor/cursor_loader.h" |
12 #include "ui/display/display.h" | 12 #include "ui/display/display.h" |
13 #include "ui/events/event.h" | 13 #include "ui/events/event.h" |
14 #include "ui/events/event_utils.h" | 14 #include "ui/events/event_utils.h" |
15 #include "ui/platform_window/platform_ime_controller.h" | 15 #include "ui/platform_window/platform_ime_controller.h" |
16 #include "ui/platform_window/platform_window.h" | 16 #include "ui/platform_window/platform_window.h" |
17 | 17 |
18 #if defined(OS_WIN) | 18 #if defined(OS_WIN) |
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
205 // with an accelerator to a character event can change the character, for | 205 // with an accelerator to a character event can change the character, for |
206 // example, from 'M' to '^M'. | 206 // example, from 'M' to '^M'. |
207 DCHECK_EQ(key_press_event->key_code(), char_event.key_code()); | 207 DCHECK_EQ(key_press_event->key_code(), char_event.key_code()); |
208 DCHECK_EQ(key_press_event->flags(), char_event.flags()); | 208 DCHECK_EQ(key_press_event->flags(), char_event.flags()); |
209 delegate_->OnEvent(char_event); | 209 delegate_->OnEvent(char_event); |
210 } | 210 } |
211 #endif | 211 #endif |
212 } | 212 } |
213 | 213 |
214 void PlatformDisplayDefault::OnCloseRequest() { | 214 void PlatformDisplayDefault::OnCloseRequest() { |
215 display::PlatformScreen::GetInstance()->RequestCloseDisplay(GetId()); | 215 display::ScreenManager::GetInstance()->RequestCloseDisplay(GetId()); |
216 } | 216 } |
217 | 217 |
218 void PlatformDisplayDefault::OnClosed() {} | 218 void PlatformDisplayDefault::OnClosed() {} |
219 | 219 |
220 void PlatformDisplayDefault::OnWindowStateChanged( | 220 void PlatformDisplayDefault::OnWindowStateChanged( |
221 ui::PlatformWindowState new_state) {} | 221 ui::PlatformWindowState new_state) {} |
222 | 222 |
223 void PlatformDisplayDefault::OnLostCapture() { | 223 void PlatformDisplayDefault::OnLostCapture() { |
224 delegate_->OnNativeCaptureLost(); | 224 delegate_->OnNativeCaptureLost(); |
225 } | 225 } |
(...skipping 13 matching lines...) Expand all Loading... |
239 } | 239 } |
240 | 240 |
241 void PlatformDisplayDefault::OnActivationChanged(bool active) {} | 241 void PlatformDisplayDefault::OnActivationChanged(bool active) {} |
242 | 242 |
243 bool PlatformDisplayDefault::IsInHighContrastMode() { | 243 bool PlatformDisplayDefault::IsInHighContrastMode() { |
244 return delegate_ ? delegate_->IsInHighContrastMode() : false; | 244 return delegate_ ? delegate_->IsInHighContrastMode() : false; |
245 } | 245 } |
246 | 246 |
247 } // namespace ws | 247 } // namespace ws |
248 } // namespace ui | 248 } // namespace ui |
OLD | NEW |