Rename gfx::Display/Screen to display::Display/Screen in ui/display, ui/ozon

ui/ozone/platform/drm/host/drm_window_host.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/ozone/platform/drm/host/drm_window_host.h"
 
 #include "base/bind.h"
+#include "ui/display/display.h"
 #include "ui/events/devices/device_data_manager.h"
 #include "ui/events/event.h"
 #include "ui/events/ozone/evdev/event_factory_evdev.h"
 #include "ui/events/ozone/events_ozone.h"
 #include "ui/events/platform/platform_event_source.h"
-#include "ui/gfx/display.h"
 #include "ui/ozone/platform/drm/host/drm_cursor.h"
 #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_overlay_manager.h"
 #include "ui/ozone/platform/drm/host/drm_window_host_manager.h"
 #include "ui/platform_window/platform_window_delegate.h"
 
 namespace ui {
 
 DrmWindowHost::DrmWindowHost(PlatformWindowDelegate* delegate,
@@ skipping 114 matching lines @@
 
   if (event->IsTouchEvent()) {
     // Dispatch the event if it is from the touchscreen associated with the
     // DrmWindowHost. We cannot check the event's location because if the
     // touchscreen has a bezel, touches in the bezel have a location outside of
     // |bounds_|.
     int64_t display_id =
         DeviceDataManager::GetInstance()->GetTargetDisplayForTouchDevice(
             event->source_device_id());
 
-    if (display_id == gfx::Display::kInvalidDisplayID)
+    if (display_id == display::Display::kInvalidDisplayID)
       return false;
 
     DrmDisplayHost* display = display_manager_->GetDisplay(display_id);
     if (!display)
       return false;
 
     DisplaySnapshot* snapshot = display->snapshot();
     if (!snapshot->current_mode())
       return false;
 
@@ skipping 37 matching lines @@
 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_->GpuWindowBoundsChanged(widget_, bounds_);
 
   overlay_manager_->ResetCache();
 }
 
 }  // namespace ui