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

ui/base/cursor/cursor_loader.h

 // Copyright (c) 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.
 
 #ifndef UI_BASE_CURSOR_CURSOR_LOADER_H_
 #define UI_BASE_CURSOR_CURSOR_LOADER_H_
 
 #include "base/logging.h"
 #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"
 
 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;
   }
 
   // Returns the current scale of the mouse cursor icon.
   float scale() const {
     return scale_;
   }
 
   // Sets the scale of the mouse cursor icon.
   void set_scale(const float scale) {
@@ skipping 22 matching lines @@
   virtual void SetPlatformCursor(gfx::NativeCursor* cursor) = 0;
 
   // Creates a CursorLoader.
   static CursorLoader* Create();
 
  private:
   // The current scale of the mouse cursor icon.
   float scale_;
 
   // The current rotation of the mouse cursor icon.
-  gfx::Display::Rotation rotation_;
+  display::Display::Rotation rotation_;
 
   DISALLOW_COPY_AND_ASSIGN(CursorLoader);
 };
 
 }  // namespace ui
 
 #endif  // UI_BASE_CURSOR_CURSOR_LOADER_H_