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

ui/display/win/dpi.cc

Index: ui/display/win/dpi.cc
diff --git a/ui/display/win/dpi.cc b/ui/display/win/dpi.cc
index e6c3d68880f59b2f38da897a662aa629044dd55c..4e8f43c6b3003bc21eac493cd4c5402fe3df9953 100644
--- a/ui/display/win/dpi.cc
+++ b/ui/display/win/dpi.cc
@@ -7,7 +7,7 @@
 #include <windows.h>
 
 #include "base/win/scoped_hdc.h"
-#include "ui/gfx/display.h"
+#include "ui/display/display.h"
 
 namespace display {
 namespace win {
@@ -49,8 +49,8 @@ void SetDefaultDeviceScaleFactor(float scale) {
 }
 
 float GetDPIScale() {
-  if (gfx::Display::HasForceDeviceScaleFactor())
-    return gfx::Display::GetForcedDeviceScaleFactor();
+  if (display::Display::HasForceDeviceScaleFactor())
+    return display::Display::GetForcedDeviceScaleFactor();
   float dpi_scale = GetUnforcedDeviceScaleFactor();
   return (dpi_scale <= 1.25f) ? 1.f : dpi_scale;
 }