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

ui/display/win/dpi.cc

 // Copyright 2012 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/display/win/dpi.h"
 
 #include <windows.h>
 
 #include "base/win/scoped_hdc.h"
-#include "ui/gfx/display.h"
+#include "ui/display/display.h"
 
 namespace display {
 namespace win {
 
 namespace {
 
 const float kDefaultDPI = 96.f;
 
 float g_device_scale_factor = 0.f;
 
@@ skipping 21 matching lines @@
 }
 
 }  // namespace
 
 void SetDefaultDeviceScaleFactor(float scale) {
   DCHECK_NE(0.f, scale);
   g_device_scale_factor = 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;
 }
 
 int GetDPIFromScalingFactor(float device_scaling_factor) {
   return kDefaultDPI * device_scaling_factor;
 }
 
 int GetSystemMetricsInDIP(int metric) {
   // The system metrics always reflect the system DPI, not whatever scale we've
   // forced or decided to use.
   return static_cast<int>(
       std::round(GetSystemMetrics(metric) / GetUnforcedDeviceScaleFactor()));
 }
 
 }  // namespace win
 }  // namespace display