Rename gfx::Display/Screen to display::Display/Screen in content/

content/common/cursors/webcursor.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 CONTENT_COMMON_CURSORS_WEBCURSOR_H_
 #define CONTENT_COMMON_CURSORS_WEBCURSOR_H_
 
 #include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "build/build_config.h"
 #include "content/common/content_export.h"
 #include "third_party/WebKit/public/platform/WebCursorInfo.h"
-#include "ui/gfx/display.h"
+#include "ui/display/display.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/native_widget_types.h"
 
 #if defined(USE_AURA)
 #include "ui/base/cursor/cursor.h"
 #endif
 
 #if defined(OS_WIN)
 typedef struct HINSTANCE__* HINSTANCE;
@@ skipping 77 matching lines @@
   // Initialize this from the given Windows cursor. The caller must ensure that
   // the HCURSOR remains valid by not invoking the DestroyCursor/DestroyIcon
   // APIs on it.
   void InitFromExternalCursor(HCURSOR handle);
 #endif
 
 #if defined(USE_AURA)
   ui::PlatformCursor GetPlatformCursor();
 
   // Updates |device_scale_factor_| and |rotation_| based on |display|.
-  void SetDisplayInfo(const gfx::Display& display);
+  void SetDisplayInfo(const display::Display& display);
 
   float GetCursorScaleFactor();
 
   void CreateScaledBitmapAndHotspotFromCustomData(
       SkBitmap* bitmap,
       gfx::Point* hotspot);
   FRIEND_TEST_ALL_PREFIXES(WebCursorTest,
                            CreateScaledBitmapAndHotspotFromCustomData);
 
 #elif defined(OS_WIN)
@@ skipping 67 matching lines @@
   ui::PlatformCursor platform_cursor_;
 #elif defined(OS_WIN)
   // A custom cursor created from custom bitmap data by Webkit.
   HCURSOR custom_cursor_;
 #endif
 #if defined(USE_AURA)
   float device_scale_factor_;
 #endif
 
 #if defined(USE_OZONE)
-  gfx::Display::Rotation rotation_;
+  display::Display::Rotation rotation_;
   gfx::Size maximum_cursor_size_;
 #endif
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_CURSORS_WEBCURSOR_H_