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

ui/base/layout.cc

Index: ui/base/layout.cc
diff --git a/ui/base/layout.cc b/ui/base/layout.cc
index 4299f097114050d96819461cbb28b5ed536c625f..06595c34914e93a8e31c30b0d468f339b65e7441 100644
--- a/ui/base/layout.cc
+++ b/ui/base/layout.cc
@@ -16,9 +16,9 @@
 #include "build/build_config.h"
 #include "ui/base/touch/touch_device.h"
 #include "ui/base/ui_base_switches.h"
-#include "ui/gfx/display.h"
+#include "ui/display/display.h"
+#include "ui/display/screen.h"
 #include "ui/gfx/image/image_skia.h"
-#include "ui/gfx/screen.h"
 
 namespace ui {
 
@@ -106,7 +106,7 @@ ScopedSetSupportedScaleFactors::~ScopedSetSupportedScaleFactors() {
 
 #if !defined(OS_MACOSX)
 float GetScaleFactorForNativeView(gfx::NativeView view) {
-  return gfx::Screen::GetScreen()
+  return display::Screen::GetScreen()
       ->GetDisplayNearestWindow(view)
       .device_scale_factor();
 }