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

ui/base/cursor/cursor_loader.h

Index: ui/base/cursor/cursor_loader.h
diff --git a/ui/base/cursor/cursor_loader.h b/ui/base/cursor/cursor_loader.h
index cf90846b6486b371c3c05e2ee15b864ba0493180..0d53ac964e19393f8f37bef56cf2add86c02b6db 100644
--- a/ui/base/cursor/cursor_loader.h
+++ b/ui/base/cursor/cursor_loader.h
@@ -9,7 +9,7 @@
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "ui/base/ui_base_export.h"
-#include "ui/gfx/display.h"
+#include "ui/display/display.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/native_widget_types.h"
 
@@ -17,14 +17,12 @@ namespace ui {
 
 class UI_BASE_EXPORT CursorLoader {
  public:
-  CursorLoader() : scale_(1.f), rotation_(gfx::Display::ROTATE_0) {}
+  CursorLoader() : scale_(1.f), rotation_(display::Display::ROTATE_0) {}
   virtual ~CursorLoader() {}
 
-  gfx::Display::Rotation rotation() const {
-    return rotation_;
-  }
+  display::Display::Rotation rotation() const { return rotation_; }
 
-  void set_rotation(gfx::Display::Rotation rotation) {
+  void set_rotation(display::Display::Rotation rotation) {
     rotation_ = rotation;
   }
 
@@ -67,7 +65,7 @@ class UI_BASE_EXPORT CursorLoader {
   float scale_;
 
   // The current rotation of the mouse cursor icon.
-  gfx::Display::Rotation rotation_;
+  display::Display::Rotation rotation_;
 
   DISALLOW_COPY_AND_ASSIGN(CursorLoader);
 };