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

ash/display/cursor_window_controller.h

 // 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.
 
 #ifndef ASH_DISPLAY_CURSOR_WINDOW_CONTROLLER_H_
 #define ASH_DISPLAY_CURSOR_WINDOW_CONTROLLER_H_
 
 #include <memory>
 
 #include "ash/ash_export.h"
 #include "base/macros.h"
 #include "ui/aura/window.h"
 #include "ui/base/cursor/cursor.h"
-#include "ui/gfx/display.h"
+#include "ui/display/display.h"
 
 namespace ash {
 namespace test {
 class MirrorWindowTestApi;
 }
 
 class CursorWindowControllerTest;
 class CursorWindowDelegate;
 
 // Draws a mouse cursor on a given container window.
@@ skipping 11 matching lines @@
   }
 
   // Sets cursor compositing mode on/off.
   void SetCursorCompositingEnabled(bool enabled);
 
   // Updates the container window for the cursor window controller.
   void UpdateContainer();
 
   // Sets the display on which to draw cursor.
   // Only applicable when cursor compositing is enabled.
-  void SetDisplay(const gfx::Display& display);
+  void SetDisplay(const display::Display& display);
 
   // Sets cursor location, shape, set and visibility.
   void UpdateLocation();
   void SetCursor(gfx::NativeCursor cursor);
   void SetCursorSet(ui::CursorSetType);
   void SetVisibility(bool visible);
 
  private:
   friend class CursorWindowControllerTest;
   friend class test::MirrorWindowTestApi;
@@ skipping 23 matching lines @@
   int cursor_type_;
 
   // The last requested cursor visibility.
   bool visible_;
 
   ui::CursorSetType cursor_set_;
   gfx::Point hot_point_;
 
   // The display on which the cursor is drawn.
   // For mirroring mode, the display is always the primary display.
-  gfx::Display display_;
+  display::Display display_;
 
   std::unique_ptr<aura::Window> cursor_window_;
   std::unique_ptr<CursorWindowDelegate> delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(CursorWindowController);
 };
 
 }  // namespace ash
 
 #endif  // ASH_DISPLAY_CURSOR_WINDOW_CONTROLLER_H_