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

ui/base/cursor/image_cursors.cc

 // Copyright 2014 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.
 
 #include "ui/base/cursor/image_cursors.h"
 
 #include <float.h>
 #include <stddef.h>
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #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 {
 
 namespace {
 
 const int kImageCursorIds[] = {
   kCursorNull,
   kCursorPointer,
   kCursorNoDrop,
@@ skipping 44 matching lines @@
 float ImageCursors::GetScale() const {
   if (!cursor_loader_) {
     NOTREACHED();
     // Returning default on release build as it's not serious enough to crash
     // even if this ever happens.
     return 1.0f;
   }
   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());
   } else if (cursor_loader_->rotation() == display.rotation() &&
              cursor_loader_->scale() == scale_factor) {
     return false;
   }
 
   cursor_loader_->set_rotation(display.rotation());
   cursor_loader_->set_scale(scale_factor);
@@ skipping 41 matching lines @@
 
   if (cursor_loader_.get())
     ReloadCursors();
 }
 
 void ImageCursors::SetPlatformCursor(gfx::NativeCursor* cursor) {
   cursor_loader_->SetPlatformCursor(cursor);
 }
 
 }  // namespace ui