Chromium Code Reviews| Index: ui/ozone/platform/drm/host/drm_window_host.cc |
| diff --git a/ui/ozone/platform/drm/host/drm_window_host.cc b/ui/ozone/platform/drm/host/drm_window_host.cc |
| index 1b17fe25ad00fa12179e8b4d7eacc729f03d27c4..760d592ddf7707220b72f5dae6ca5b9b401cab43 100644 |
| --- a/ui/ozone/platform/drm/host/drm_window_host.cc |
| +++ b/ui/ozone/platform/drm/host/drm_window_host.cc |
| @@ -16,7 +16,8 @@ |
| #include "ui/ozone/platform/drm/host/drm_display_host.h" |
| #include "ui/ozone/platform/drm/host/drm_display_host_manager.h" |
| #include "ui/ozone/platform/drm/host/drm_gpu_platform_support_host.h" |
| -#include "ui/ozone/platform/drm/host/drm_overlay_candidates_host.h" |
| +// #include "ui/ozone/platform/drm/host/drm_overlay_candidates_host.h" |
|
dnicoara
2016/01/26 14:14:23
Remove commented include
rjkroege
2016/01/26 23:58:56
Done.
|
| +#include "ui/ozone/platform/drm/host/drm_overlay_manager.h" |
| #include "ui/ozone/platform/drm/host/drm_window_host_manager.h" |
| #include "ui/platform_window/platform_window_delegate.h" |
| @@ -28,14 +29,15 @@ DrmWindowHost::DrmWindowHost(PlatformWindowDelegate* delegate, |
| EventFactoryEvdev* event_factory, |
| DrmCursor* cursor, |
| DrmWindowHostManager* window_manager, |
| - DrmDisplayHostManager* display_manager) |
| + DrmDisplayHostManager* display_manager, |
| + DrmOverlayManager* overlay_manager) |
| : delegate_(delegate), |
| sender_(sender), |
| event_factory_(event_factory), |
| cursor_(cursor), |
| window_manager_(window_manager), |
| display_manager_(display_manager), |
| - overlay_candidates_host_(nullptr), |
| + overlay_manager_(overlay_manager), |
| bounds_(bounds), |
| widget_(window_manager->NextAcceleratedWidget()) { |
| window_manager_->AddWindow(widget_, this); |
| @@ -195,19 +197,13 @@ void DrmWindowHost::OnChannelEstablished() { |
| void DrmWindowHost::OnChannelDestroyed() { |
| } |
| -void DrmWindowHost::SetOverlayCandidatesHost( |
| - DrmOverlayCandidatesHostCore* host) { |
| - overlay_candidates_host_ = host; |
| -} |
| - |
| void DrmWindowHost::SendBoundsChange() { |
| // Update the cursor before the window so that the cursor stays within the |
| // window bounds when the window size shrinks. |
| cursor_->CommitBoundsChange(widget_, bounds_, GetCursorConfinedBounds()); |
| sender_->Send(new OzoneGpuMsg_WindowBoundsChanged(widget_, bounds_)); |
| - if (overlay_candidates_host_) |
| - overlay_candidates_host_->ResetCache(); |
| + overlay_manager_->ResetCache(); |
| } |
| } // namespace ui |