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

ui/base/cursor/cursor_loader_x11.cc

 // 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.
 
 #include "ui/base/cursor/cursor_loader_x11.h"
 
 #include <float.h>
 #include <X11/cursorfont.h>
 #include <X11/Xlib.h>
 
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "skia/ext/image_operations.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/base/cursor/cursor_util.h"
 #include "ui/base/x/x11_util.h"
+#include "ui/display/display.h"
 #include "ui/gfx/geometry/point_conversions.h"
 #include "ui/gfx/geometry/size_conversions.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/skbitmap_operations.h"
 #include "ui/gfx/skia_util.h"
 
 namespace {
 
 // Returns X font cursor shape from an Aura cursor.
 int CursorShapeFromNative(const gfx::NativeCursor& native_cursor) {
@@ skipping 175 matching lines @@
 void CursorLoaderX11::SetPlatformCursor(gfx::NativeCursor* cursor) {
   DCHECK(cursor);
 
   ::Cursor xcursor;
   if (IsImageCursor(*cursor))
     xcursor = ImageCursorFromNative(*cursor);
   else if (*cursor == kCursorNone)
     xcursor =  invisible_cursor_.get();
   else if (*cursor == kCursorCustom)
     xcursor = cursor->platform();
-  else if (scale() == 1.0f && rotation() == gfx::Display::ROTATE_0) {
+  else if (scale() == 1.0f && rotation() == display::Display::ROTATE_0) {
     xcursor = GetXCursor(CursorShapeFromNative(*cursor));
   } else {
     xcursor = ImageCursorFromNative(kCursorPointer);
   }
 
   cursor->SetPlatformCursor(xcursor);
 }
 
 const XcursorImage* CursorLoaderX11::GetXcursorImageForTest(int id) {
   return test::GetCachedXcursorImage(cursors_[id]);
@@ skipping 10 matching lines @@
   if (animated_cursors_.count(type))
     return animated_cursors_[type].first;
 
   ImageCursorMap::iterator find = cursors_.find(type);
   if (find != cursors_.end())
     return cursors_[type];
   return GetXCursor(CursorShapeFromNative(native_cursor));
 }
 
 }  // namespace ui