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

ui/base/cursor/image_cursors.cc

Index: ui/base/cursor/image_cursors.cc
diff --git a/ui/base/cursor/image_cursors.cc b/ui/base/cursor/image_cursors.cc
index 54b851e2479cfae65e3bf12ecb858be894d04a02..32ff66136497bbec28fb3e54baf6e23014e52905 100644
--- a/ui/base/cursor/image_cursors.cc
+++ b/ui/base/cursor/image_cursors.cc
@@ -13,7 +13,7 @@
 #include "ui/base/cursor/cursor.h"
 #include "ui/base/cursor/cursor_loader.h"
 #include "ui/base/cursor/cursors_aura.h"
-#include "ui/gfx/display.h"
+#include "ui/display/display.h"
 #include "ui/gfx/geometry/point.h"
 
 namespace ui {
@@ -78,17 +78,17 @@ float ImageCursors::GetScale() const {
   return cursor_loader_->scale();
 }
 
-gfx::Display::Rotation ImageCursors::GetRotation() const {
+display::Display::Rotation ImageCursors::GetRotation() const {
   if (!cursor_loader_) {
     NOTREACHED();
     // Returning default on release build as it's not serious enough to crash
     // even if this ever happens.
-    return gfx::Display::ROTATE_0;
+    return display::Display::ROTATE_0;
   }
   return cursor_loader_->rotation();
 }
 
-bool ImageCursors::SetDisplay(const gfx::Display& display,
+bool ImageCursors::SetDisplay(const display::Display& display,
                               float scale_factor) {
   if (!cursor_loader_) {
     cursor_loader_.reset(CursorLoader::Create());