Move gfx::Display/Screen to display::Display/Screen in ui/base

ui/base/l10n/l10n_util_win.cc

Index: ui/base/l10n/l10n_util_win.cc
diff --git a/ui/base/l10n/l10n_util_win.cc b/ui/base/l10n/l10n_util_win.cc
index 1e1da3bf6931a39f7b26acd7105973ef44121c07..cd5b519d1de9bf4553f5476d0b471773ef8d7096 100644
--- a/ui/base/l10n/l10n_util_win.cc
+++ b/ui/base/l10n/l10n_util_win.cc
@@ -17,8 +17,8 @@
 #include "base/win/i18n.h"
 #include "base/win/windows_version.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/display/display.h"
 #include "ui/display/win/dpi.h"
-#include "ui/gfx/display.h"
 #include "ui/strings/grit/app_locale_settings.h"
 
 namespace {
@@ -156,7 +156,7 @@ bool NeedOverrideDefaultUIFont(base::string16* override_font_family,
 
 void AdjustUIFont(LOGFONT* logfont) {
   float dpi_scale = display::win::GetDPIScale();
-  if (gfx::Display::HasForceDeviceScaleFactor()) {
+  if (display::Display::HasForceDeviceScaleFactor()) {
     // If the scale is forced, we don't need to adjust it here.
     dpi_scale = 1.0f;
   }